SPI cleanup

First step towards generic SPI channels.