diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-02-04 10:19:28 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-02-04 10:19:28 +0000 |
| commit | d37d39b0e807736dd71bc38ed55a8c8f59c11e41 (patch) | |
| tree | cb6c6f12f0251a9f69ba6602e85d58df75127d29 /target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch | |
| parent | 6381f75bd6f853a64688147377a5374b5ecb3181 (diff) | |
| download | upstream-d37d39b0e807736dd71bc38ed55a8c8f59c11e41.tar.gz upstream-d37d39b0e807736dd71bc38ed55a8c8f59c11e41.tar.bz2 upstream-d37d39b0e807736dd71bc38ed55a8c8f59c11e41.zip | |
kernel: generic: update to 3.8-rc6
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35478 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.8/009-mmc_mvsdio_add_pinctrl.patch | 30 |
1 files changed, 26 insertions, 4 deletions
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 9f98bda135..394ca5b9fa 100644 --- 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,8 +26,13 @@ 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(+) --- a/drivers/mmc/host/mvsdio.c @@ -23,7 +45,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> #include <asm/sizes.h> #include <asm/unaligned.h> -@@ -692,6 +693,7 @@ static int __init mvsd_probe(struct plat +@@ -690,6 +691,7 @@ static int __init mvsd_probe(struct plat struct resource *r; int ret, irq; int gpio_card_detect, gpio_write_protect; @@ -31,9 +53,9 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> r = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq = platform_get_irq(pdev, 0); -@@ -713,6 +715,10 @@ static int __init mvsd_probe(struct plat +@@ -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)) |