spi: Merge up fixes

We need the fixes to apply new changes to the Cirrus drivers.

diff --cc drivers/spi/spi-cs42l43.c
Simple merge

diff --cc drivers/spi/spi-imx.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc include/linux/spi/spi.h
Simple merge