From d57d223446deb40065314b6dba5286b897dec8b8 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 19 Apr 2012 20:31:02 +0200 Subject: [PATCH] --- yaml --- r: 310259 b: refs/heads/master c: d313a86d2efb2c5568832389663322e93e291c59 h: refs/heads/master i: 310257: 369a7e5be4d50a0d954a236b44951d0539dd2e9c 310255: d90f8a5afaeb8d2b699c3b0b1c55b5717fcb4f6e v: v3 --- [refs] | 2 +- trunk/drivers/video/mxsfb.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f5cce62b965e..a745f022258a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2de06df49f71fee795e997dee1eeda74a2b8598b +refs/heads/master: d313a86d2efb2c5568832389663322e93e291c59 diff --git a/trunk/drivers/video/mxsfb.c b/trunk/drivers/video/mxsfb.c index 4a89f889852d..dcf29bf91939 100644 --- a/trunk/drivers/video/mxsfb.c +++ b/trunk/drivers/video/mxsfb.c @@ -880,6 +880,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 +908,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,