Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-sh-hspi.c
index 755d7cc9e72f27b5600042c57858243b9c6633fd,82d2f922ffa0a830883fee3aafff2be4b86c1d50,82d2f922ffa0a830883fee3aafff2be4b86c1d50,89cfedf6d21a8fa10d4a82b1b6c0e6786dc8d6e6,82d2f922ffa0a830883fee3aafff2be4b86c1d50,82d2f922ffa0a830883fee3aafff2be4b86c1d50,82d2f922ffa0a830883fee3aafff2be4b86c1d50,82d2f922ffa0a830883fee3aafff2be4b86c1d50..9009456bdf4d29c6febf56b162113fa5e4bf78ef
--- 1/drivers/spi/spi-sh-hspi.c
--- 2/drivers/spi/spi-sh-hspi.c
--- 3/drivers/spi/spi-sh-hspi.c
--- 4/drivers/spi/spi-sh-hspi.c
--- 5/drivers/spi/spi-sh-hspi.c
--- 6/drivers/spi/spi-sh-hspi.c
--- 7/drivers/spi/spi-sh-hspi.c
--- 8/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@@@@@@@@ -298,9 -298,10 -298,10 -268,8 -298,10 -298,10 -298,10 -298,10 +268,7 @@@@@@@@@ static int hspi_probe(struct platform_d
        
                pm_runtime_enable(&pdev->dev);
        
 -------        master->num_chipselect  = 1;
                master->bus_num         = pdev->id;
--- ----        master->setup           = hspi_setup;
--- ----        master->cleanup         = hspi_cleanup;
                master->mode_bits       = SPI_CPOL | SPI_CPHA;
                master->dev.of_node     = pdev->dev.of_node;
                master->auto_runtime_pm = true;

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

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