Merge branch 'spi-5.4' into spi-next

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

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

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