summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-05-06 23:01:41 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-05-12 09:43:19 +0800
commitfe233b9df3842b3927c0275322a8047f8b33b194 (patch)
treec9a2ebcdfdfdb2ee97da7ee0d70fbb9b6d2f5899 /drivers/video
parentf755865f9082a6632f06b8314068a883508d91ca (diff)
video: mxsfb: adopt pinctrl support
Cc: linux-fbdev@vger.kernel.org Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/mxsfb.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 4a89f889852d..6c6bc578d0fc 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -45,6 +45,7 @@
#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
+#include <linux/pinctrl/consumer.h>
#include <mach/mxsfb.h>
#define REG_SET 4
@@ -756,6 +757,7 @@ static int __devinit mxsfb_probe(struct platform_device *pdev)
struct mxsfb_info *host;
struct fb_info *fb_info;
struct fb_modelist *modelist;
+ struct pinctrl *pinctrl;
int i, ret;
if (!pdata) {
@@ -793,6 +795,12 @@ static int __devinit mxsfb_probe(struct platform_device *pdev)
host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data];
+ pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+ if (IS_ERR(pinctrl)) {
+ ret = PTR_ERR(pinctrl);
+ goto error_getpin;
+ }
+
host->clk = clk_get(&host->pdev->dev, NULL);
if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk);
@@ -848,6 +856,7 @@ error_init_fb:
error_pseudo_pallette:
clk_put(host->clk);
error_getclock:
+error_getpin:
iounmap(host->base);
error_ioremap:
framebuffer_release(fb_info);