mvebu: switch to 3.10

[openwrt/staging/chunkeey.git] / target / linux / mvebu / patches-3.8 / 009-mmc_mvsdio_add_pinctrl.patch

diff --git a/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch b/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch
index 394fc4cebabd307f128c1a697680c72be0635ee5..394ca5b9fa60a423501cd2c919f69fb2575a5a50 100644 (file)
--- a/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch
+++ b/target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch
@@ -1,3 +1,20 @@
+From patchwork Wed Jan 16 13:14:00 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [5/5] mmc: mvsdio: add pinctrl integration
+Date: Wed, 16 Jan 2013 13:14:00 -0000
+From: Andrew Lunn <andrew@lunn.ch>
+X-Patchwork-Id: 1987901
+Message-Id: <1358342040-7130-6-git-send-email-andrew@lunn.ch>
+To: Jason Cooper <jason@lakedaemon.net>
+Cc: linux ARM <linux-arm-kernel@lists.infradead.org>,
+ linux-mmc@vger.kernel.org, linux@arm.linux.org.uk,
+ Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
+ Andrew Lunn <andrew@lunn.ch>
+
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
 On many Marvell SoCs, the pins used for the SDIO interface are part of
 the MPP pins, that are muxable pins. In order to get the muxing of
 those pins correct, this commit integrates the mvsdio driver with the
@@ -9,12 +26,15 @@ platforms have yet been fully converted to using the pinctrl
 infrastructure.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Tested-by: Stefan Peter <s.peter@mpl.ch>
+Tested-by: Florian Fainelli <florian@openwrt.org>
+Signed-off-by: Jason Cooper <jason@lakedaemon.net>
+
 ---
- drivers/mmc/host/mvsdio.c |    6 ++++++
+drivers/mmc/host/mvsdio.c |    6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index 56954bc..feb16bd 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -25,6 +25,7 @@
@@ -25,7 +45,7 @@ index 56954bc..feb16bd 100644
  
  #include <asm/sizes.h>
  #include <asm/unaligned.h>
-@@ -692,6 +693,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -690,6 +691,7 @@ static int __init mvsd_probe(struct plat
        struct resource *r;
        int ret, irq;
        int gpio_card_detect, gpio_write_protect;
@@ -33,9 +53,9 @@ index 56954bc..feb16bd 100644
  
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq = platform_get_irq(pdev, 0);
-@@ -713,6 +715,10 @@ static int __init mvsd_probe(struct platform_device *pdev)
+@@ -706,6 +708,10 @@ static int __init mvsd_probe(struct plat
+       host->mmc = mmc;
        host->dev = &pdev->dev;
-       host->res = r;
  
 +      pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
 +      if (IS_ERR(pinctrl))
@@ -44,5 +64,3 @@ index 56954bc..feb16bd 100644
        /* Some non-DT platforms do not pass a clock, and the clock
           frequency is passed through platform_data. On DT platforms,
           a clock must always be passed, even if there is no gatable
--- 
-1.7.9.5