Commit 87e31a07 authored by Sascha Hauer's avatar Sascha Hauer Committed by Greg Kroah-Hartman

staging: drm/imx: Add pinctrl support to parallel display driver

To allow the iomux to be configured for the display.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0125f21b
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/pinctrl/consumer.h>
#include "imx-drm.h" #include "imx-drm.h"
...@@ -195,11 +196,20 @@ static int __devinit imx_pd_probe(struct platform_device *pdev) ...@@ -195,11 +196,20 @@ static int __devinit imx_pd_probe(struct platform_device *pdev)
struct imx_parallel_display *imxpd; struct imx_parallel_display *imxpd;
int ret; int ret;
const char *fmt; const char *fmt;
struct pinctrl *pinctrl;
imxpd = devm_kzalloc(&pdev->dev, sizeof(*imxpd), GFP_KERNEL); imxpd = devm_kzalloc(&pdev->dev, sizeof(*imxpd), GFP_KERNEL);
if (!imxpd) if (!imxpd)
return -ENOMEM; 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); edidp = of_get_property(np, "edid", &imxpd->edid_len);
if (edidp) if (edidp)
imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL); imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment