diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 16:29:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-13 15:07:33 -0800 |
| commit | 87e31a0795059315576cccce1205aed663c6502d (patch) | |
| tree | 7718613efac27e8f0de161b19ccf0625ac49d20a /drivers/staging/imx-drm | |
| parent | 0125f21b2bafde5e8dc34a31c20d2db6f3645bdc (diff) | |
| download | lwn-87e31a0795059315576cccce1205aed663c6502d.tar.gz lwn-87e31a0795059315576cccce1205aed663c6502d.zip | |
staging: drm/imx: Add pinctrl support to parallel display driver
To allow the iomux to be configured for the display.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
| -rw-r--r-- | drivers/staging/imx-drm/parallel-display.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c index 9b51d732eefa..324283c95530 100644 --- a/drivers/staging/imx-drm/parallel-display.c +++ b/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); |