Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24...

diff --cc drivers/spi/Kconfig
Simple merge

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

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

diff --cc drivers/spi/spi-ti-qspi.c
index 286cf8d6764beac9f7e705692ffc3c055c836c3d,0b71270fbf67ba671dd43f116db48de30076514c,251e43f72dbb51b01545db7b405d452ce8926b5c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c,0b71270fbf67ba671dd43f116db48de30076514c..3d09265b51335e2cefdf3d098ce177826b150674
--- 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
+++ b/drivers/spi/spi-ti-qspi.c
@@@@@@@@@@@@ -460,9 -462,10 -445,38 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 -462,10 +443,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