diff options
Diffstat (limited to 'drivers/video/mxsfb.c')
-rw-r--r-- | drivers/video/mxsfb.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 49619b441500..755556ca5b2d 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c | |||
@@ -369,7 +369,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info) | |||
369 | loop--; | 369 | loop--; |
370 | } | 370 | } |
371 | 371 | ||
372 | writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR); | 372 | reg = readl(host->base + LCDC_VDCTRL4); |
373 | writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4); | ||
373 | 374 | ||
374 | clk_disable_unprepare(host->clk); | 375 | clk_disable_unprepare(host->clk); |
375 | 376 | ||
@@ -586,7 +587,7 @@ static struct fb_ops mxsfb_ops = { | |||
586 | .fb_imageblit = cfb_imageblit, | 587 | .fb_imageblit = cfb_imageblit, |
587 | }; | 588 | }; |
588 | 589 | ||
589 | static int __devinit mxsfb_restore_mode(struct mxsfb_info *host) | 590 | static int mxsfb_restore_mode(struct mxsfb_info *host) |
590 | { | 591 | { |
591 | struct fb_info *fb_info = &host->fb_info; | 592 | struct fb_info *fb_info = &host->fb_info; |
592 | unsigned line_count; | 593 | unsigned line_count; |
@@ -677,7 +678,7 @@ static int __devinit mxsfb_restore_mode(struct mxsfb_info *host) | |||
677 | return 0; | 678 | return 0; |
678 | } | 679 | } |
679 | 680 | ||
680 | static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host) | 681 | static int mxsfb_init_fbinfo(struct mxsfb_info *host) |
681 | { | 682 | { |
682 | struct fb_info *fb_info = &host->fb_info; | 683 | struct fb_info *fb_info = &host->fb_info; |
683 | struct fb_var_screeninfo *var = &fb_info->var; | 684 | struct fb_var_screeninfo *var = &fb_info->var; |
@@ -739,7 +740,7 @@ static int __devinit mxsfb_init_fbinfo(struct mxsfb_info *host) | |||
739 | return 0; | 740 | return 0; |
740 | } | 741 | } |
741 | 742 | ||
742 | static void __devexit mxsfb_free_videomem(struct mxsfb_info *host) | 743 | static void mxsfb_free_videomem(struct mxsfb_info *host) |
743 | { | 744 | { |
744 | struct fb_info *fb_info = &host->fb_info; | 745 | struct fb_info *fb_info = &host->fb_info; |
745 | 746 | ||
@@ -772,7 +773,7 @@ static const struct of_device_id mxsfb_dt_ids[] = { | |||
772 | }; | 773 | }; |
773 | MODULE_DEVICE_TABLE(of, mxsfb_dt_ids); | 774 | MODULE_DEVICE_TABLE(of, mxsfb_dt_ids); |
774 | 775 | ||
775 | static int __devinit mxsfb_probe(struct platform_device *pdev) | 776 | static int mxsfb_probe(struct platform_device *pdev) |
776 | { | 777 | { |
777 | const struct of_device_id *of_id = | 778 | const struct of_device_id *of_id = |
778 | of_match_device(mxsfb_dt_ids, &pdev->dev); | 779 | of_match_device(mxsfb_dt_ids, &pdev->dev); |
@@ -912,7 +913,7 @@ error_alloc_info: | |||
912 | return ret; | 913 | return ret; |
913 | } | 914 | } |
914 | 915 | ||
915 | static int __devexit mxsfb_remove(struct platform_device *pdev) | 916 | static int mxsfb_remove(struct platform_device *pdev) |
916 | { | 917 | { |
917 | struct fb_info *fb_info = platform_get_drvdata(pdev); | 918 | struct fb_info *fb_info = platform_get_drvdata(pdev); |
918 | struct mxsfb_info *host = to_imxfb_host(fb_info); | 919 | struct mxsfb_info *host = to_imxfb_host(fb_info); |
@@ -949,7 +950,7 @@ static void mxsfb_shutdown(struct platform_device *pdev) | |||
949 | 950 | ||
950 | static struct platform_driver mxsfb_driver = { | 951 | static struct platform_driver mxsfb_driver = { |
951 | .probe = mxsfb_probe, | 952 | .probe = mxsfb_probe, |
952 | .remove = __devexit_p(mxsfb_remove), | 953 | .remove = mxsfb_remove, |
953 | .shutdown = mxsfb_shutdown, | 954 | .shutdown = mxsfb_shutdown, |
954 | .id_table = mxsfb_devtype, | 955 | .id_table = mxsfb_devtype, |
955 | .driver = { | 956 | .driver = { |