Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus