From: Mark Brown <broonie@linaro.org>
Date: Fri, 20 Dec 2013 12:35:28 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm28... 
X-Git-Tag: next-20140106~30^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c9a29c17875a14a5e9c70a774b5384b6bf1aefb;p=karo-tx-linux.git

Merge remote-tracking branches 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/designware', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/qspi', 'spi/topic/rcar', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-next
---

7c9a29c17875a14a5e9c70a774b5384b6bf1aefb
diff --cc drivers/spi/spi-ti-qspi.c
index 4396bd448540,0b71270fbf67,0b71270fbf67,4396bd448540,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,1211b663c814,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67,0b71270fbf67..9ae846558f5f
--- a/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;
 ++ ++++++++++++++++++++++++	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;
++++++++++++++++++ +++++++++		}
++++++++++++++++++ +++++++++	}
+  +                        
 -- -------------- ---------	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++++++++++++++++++ +++++++++	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) {