From 5cf61af13b21089bb21b9efab04ecb6f14941310 Mon Sep 17 00:00:00 2001
From: Chris Ball <cjb@laptop.org>
Date: Mon, 28 Jan 2013 06:26:53 -0500
Subject: [PATCH] --- yaml --- r: 359899 b: refs/heads/master c:
 d2938758caae523768f60208dbc8a487be3f0bd5 h: refs/heads/master i:   359897:
 9d2d4e59d8877c115df5052f5ea7f1c966f51e04   359895:
 e33bc386fe0646cb68ec97362901207970cf5eef v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mmc/host/mvsdio.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ae102e81a70..e19ee35ed2b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 182ce2162bcc2a1f7bb7137d621a6ea97ccdd635
+refs/heads/master: d2938758caae523768f60208dbc8a487be3f0bd5
diff --git a/trunk/drivers/mmc/host/mvsdio.c b/trunk/drivers/mmc/host/mvsdio.c
index 78d3abf837c2..145cdaf000d1 100644
--- a/trunk/drivers/mmc/host/mvsdio.c
+++ b/trunk/drivers/mmc/host/mvsdio.c
@@ -25,6 +25,7 @@
 #include <linux/of_irq.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/slot-gpio.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <asm/sizes.h>
 #include <asm/unaligned.h>
@@ -690,6 +691,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
 	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 platform_device *pdev)
 	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,