1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 4a89f889852d..abbe691047bd 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);
@@ -880,6 +889,18 @@ static int __devexit mxsfb_remove(struct platform_device *pdev)
         return 0;
 }
 
+static void mxsfb_shutdown(struct platform_device *pdev)
+{
+        struct fb_info *fb_info = platform_get_drvdata(pdev);
+        struct mxsfb_info *host = to_imxfb_host(fb_info);
+
+        /*
+         * Force stop the LCD controller as keeping it running during reboot
+         * might interfere with the BootROM's boot mode pads sampling.
+         */
+        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_CLR);
+}
+
 static struct platform_device_id mxsfb_devtype[] = {
         {
                 .name = "imx23-fb",
@@ -896,6 +917,7 @@ MODULE_DEVICE_TABLE(platform, mxsfb_devtype);
 static struct platform_driver mxsfb_driver = {
         .probe = mxsfb_probe,
         .remove = __devexit_p(mxsfb_remove),
+        .shutdown = mxsfb_shutdown,
         .id_table = mxsfb_devtype,
         .driver = {
                    .name = DRIVER_NAME,