From: Mark Brown <broonie@linaro.org>
Date: Thu, 23 Jan 2014 13:07:14 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24... 
X-Git-Tag: v3.14-rc1~91^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8aeab58e560da02772d6018eb4d6923514476a04;p=kernel%2Fkernel-generic.git

Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-linus
---

8aeab58e560da02772d6018eb4d6923514476a04
diff --cc drivers/spi/spi-ti-qspi.c
index 286cf8d,0b71270,251e43f,0b71270,0b71270,0b71270,0b71270,0b71270,0b71270,0b71270,0b71270..3d09265
--- a/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;
 ++++++++++	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;
++ ++++++++		}
++ ++++++++	}
+          
 - --------	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ ++++++++	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) {