From a845af2db24bc67f66825123357774f2fff34e80 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 12 Nov 2012 16:29:03 +0100
Subject: [PATCH] --- yaml --- r: 337843 b: refs/heads/master c:
 87e31a0795059315576cccce1205aed663c6502d h: refs/heads/master i:   337841:
 fe519094a0062b1c2b5edd7b31e6a42b3a16b458   337839:
 3d3666eb5966b2230dad0d48ef0bd8a692cda4fc v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/staging/imx-drm/parallel-display.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d66f2f51f48f..97e8f369776e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0125f21b2bafde5e8dc34a31c20d2db6f3645bdc
+refs/heads/master: 87e31a0795059315576cccce1205aed663c6502d
diff --git a/trunk/drivers/staging/imx-drm/parallel-display.c b/trunk/drivers/staging/imx-drm/parallel-display.c
index 9b51d732eefa..324283c95530 100644
--- a/trunk/drivers/staging/imx-drm/parallel-display.c
+++ b/trunk/drivers/staging/imx-drm/parallel-display.c
@@ -23,6 +23,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <linux/videodev2.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "imx-drm.h"
 
@@ -195,11 +196,20 @@ static int __devinit imx_pd_probe(struct platform_device *pdev)
 	struct imx_parallel_display *imxpd;
 	int ret;
 	const char *fmt;
+	struct pinctrl *pinctrl;
 
 	imxpd = devm_kzalloc(&pdev->dev, sizeof(*imxpd), GFP_KERNEL);
 	if (!imxpd)
 		return -ENOMEM;
 
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl)) {
+		ret = PTR_ERR(pinctrl);
+		dev_warn(&pdev->dev, "pinctrl_get_select_default failed with %d",
+				ret);
+		return ret;
+	}
+
 	edidp = of_get_property(np, "edid", &imxpd->edid_len);
 	if (edidp)
 		imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);