Merge remote-tracking branches 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm28...

diff --cc drivers/spi/Kconfig
Simple merge

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

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

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

diff --cc drivers/spi/spi-ti-qspi.c
index 4396bd44854063d9488cfd5dadc863c40c9e1dbf,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,4396bd44854063d9488cfd5dadc863c40c9e1dbf,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,1211b663c8142440e2c9f14af3d81aeddd3522f4,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c..9ae846558f5fb2c7c6a05cb886877869c2d90c9b
--- 1/drivers/spi/spi-ti-qspi.c
--- 2/drivers/spi/spi-ti-qspi.c
--- 3/drivers/spi/spi-ti-qspi.c
--- 4/drivers/spi/spi-ti-qspi.c
--- 5/drivers/spi/spi-ti-qspi.c
--- 6/drivers/spi/spi-ti-qspi.c
--- 7/drivers/spi/spi-ti-qspi.c
--- 8/drivers/spi/spi-ti-qspi.c
--- 9/drivers/spi/spi-ti-qspi.c
--- 10/drivers/spi/spi-ti-qspi.c
--- 11/drivers/spi/spi-ti-qspi.c
--- 12/drivers/spi/spi-ti-qspi.c
--- 13/drivers/spi/spi-ti-qspi.c
--- 14/drivers/spi/spi-ti-qspi.c
--- 15/drivers/spi/spi-ti-qspi.c
--- 16/drivers/spi/spi-ti-qspi.c
--- 17/drivers/spi/spi-ti-qspi.c
--- 18/drivers/spi/spi-ti-qspi.c
--- 19/drivers/spi/spi-ti-qspi.c
--- 20/drivers/spi/spi-ti-qspi.c
--- 21/drivers/spi/spi-ti-qspi.c
--- 22/drivers/spi/spi-ti-qspi.c
--- 23/drivers/spi/spi-ti-qspi.c
--- 24/drivers/spi/spi-ti-qspi.c
--- 25/drivers/spi/spi-ti-qspi.c
--- 26/drivers/spi/spi-ti-qspi.c
--- 27/drivers/spi/spi-ti-qspi.c
--- 28/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -462,9 -462,10 -462,10 -462,9 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -466,38 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 +466,37 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ static int ti_qspi_probe(struct platfor
                                qspi = spi_master_get_devdata(master);
                                qspi->master = master;
                                qspi->dev = &pdev->dev;
-  -                            r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 ++ ++++++++++++++++++++++++    platform_set_drvdata(pdev, qspi);
 ++ ++++++++++++++ +++++++++
 -- -------------- ---------    r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++++++++++++++++++ +++++++++    r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_base");
++++++++++++++++++ +++++++++    if (r == NULL) {
++++++++++++++++++ +++++++++            r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++++++++++++++++++ +++++++++            if (r == NULL) {
++++++++++++++++++ +++++++++                    dev_err(&pdev->dev, "missing platform data\n");
++++++++++++++++++ +++++++++                    return -ENODEV;
++++++++++++++++++ +++++++++            }
++++++++++++++++++ +++++++++    }
++++++++++++++++++ +++++++++
++++++++++++++++++ +++++++++    res_mmap = platform_get_resource_byname(pdev,
++++++++++++++++++ +++++++++                    IORESOURCE_MEM, "qspi_mmap");
++++++++++++++++++ +++++++++    if (res_mmap == NULL) {
++++++++++++++++++ +++++++++            res_mmap = platform_get_resource(pdev, IORESOURCE_MEM, 1);
++++++++++++++++++ +++++++++            if (res_mmap == NULL) {
++++++++++++++++++ +++++++++                    dev_err(&pdev->dev,
++++++++++++++++++ +++++++++                            "memory mapped resource not required\n");
++++++++++++++++++ +++++++++                    return -ENODEV;
++++++++++++++++++ +++++++++            }
++++++++++++++++++ +++++++++    }
+  +                        
++++++++++++++++++ +++++++++    res_ctrl = platform_get_resource_byname(pdev,
++++++++++++++++++ +++++++++                    IORESOURCE_MEM, "qspi_ctrlmod");
++++++++++++++++++ +++++++++    if (res_ctrl == NULL) {
++++++++++++++++++ +++++++++            res_ctrl = platform_get_resource(pdev, IORESOURCE_MEM, 2);
++++++++++++++++++ +++++++++            if (res_ctrl == NULL) {
++++++++++++++++++ +++++++++                    dev_dbg(&pdev->dev,
++++++++++++++++++ +++++++++                            "control module resources not required\n");
++++++++++++++++++ +++++++++            }
++++++++++++++++++ +++++++++    }
                            
                                irq = platform_get_irq(pdev, 0);
                                if (irq < 0) {

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