split spi patch, follow mainline file naming