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 X-Patchwork-Id: 1987901 Message-Id: <1358342040-7130-6-git-send-email-andrew@lunn.ch> To: Jason Cooper Cc: linux ARM , linux-mmc@vger.kernel.org, linux@arm.linux.org.uk, Thomas Petazzoni , Andrew Lunn From: Thomas Petazzoni 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 pinctrl infrastructure by calling devm_pinctrl_get_select_default() during ->probe(). Note that we permit this function to fail because not all Marvell platforms have yet been fully converted to using the pinctrl infrastructure. Signed-off-by: Thomas Petazzoni Signed-off-by: Andrew Lunn Tested-by: Stefan Peter Tested-by: Florian Fainelli Signed-off-by: Jason Cooper --- drivers/mmc/host/mvsdio.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -690,6 +691,7 @@ static int __init mvsd_probe(struct plat struct resource *r; int ret, irq; int gpio_card_detect, gpio_write_protect; + struct pinctrl *pinctrl; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq = platform_get_irq(pdev, 0); @@ -706,6 +708,10 @@ static int __init mvsd_probe(struct plat host->mmc = mmc; host->dev = &pdev->dev; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&pdev->dev, "no pins associated\n"); + /* 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