diff options
| author | Adam Lussier <adam.lussier@timesys.com> | 2013-02-25 17:19:04 -0500 |
|---|---|---|
| committer | Adam Lussier <adam.lussier@timesys.com> | 2013-02-25 17:19:04 -0500 |
| commit | f962cbcefdfad22ffff41e19ad4c5ff58815c05c (patch) | |
| tree | e9424582f1fdc92d360ff58c831ddf801a268e3f /drivers/video/mvf_dcu.c | |
| parent | 15f55e0b22f8953b56fb5d6bdf8b770228f2f449 (diff) | |
| parent | 16af5ee7d9556c47b332788e4107cbed5ee7ec10 (diff) | |
Merge remote-tracking branch 'github/3.0-pcm052' into 3.0-pcm0523.0-pcm052-ts2
Release 3.0-ts2: enable USB support for the phyCORE Vybrid
Diffstat (limited to 'drivers/video/mvf_dcu.c')
| -rw-r--r-- | drivers/video/mvf_dcu.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/video/mvf_dcu.c b/drivers/video/mvf_dcu.c index 0df5d053a62f..829d9443f59a 100644 --- a/drivers/video/mvf_dcu.c +++ b/drivers/video/mvf_dcu.c @@ -740,8 +740,8 @@ static int mvf_dcu_open(struct fb_info *info, int user) mfbi->index = info->node; spin_lock(&dcu_lock); - // if first time any layer open (e.g., at boot time) reset all - if(total_open_layers == 0) { + /* if first time any layer open (e.g., at boot time) reset all */ + if (total_open_layers == 0) { writel(0, dcu->base + DCU_INT_STATUS); writel(0, dcu->base + DCU_PARR_ERR_STA_1); @@ -938,21 +938,17 @@ static void free_irq_local(int irq, struct mvf_dcu_fb_data *dcu) static int mvf_dcu_suspend(struct platform_device *pdev, pm_message_t state) { - struct mvf_dcu_fb_data *dcu; - - dcu = dev_get_drvdata(&pdev->dev); - disable_lcdc(dcu->mvf_dcu_info[0]); + struct mvf_dcu_fb_data *dcu = dev_get_drvdata(&pdev->dev); + clk_disable(dcu->clk); return 0; } static int mvf_dcu_resume(struct platform_device *pdev) { - struct mvf_dcu_fb_data *dcu; - - dcu = dev_get_drvdata(&pdev->dev); - enable_lcdc(dcu->mvf_dcu_info[0]); + struct mvf_dcu_fb_data *dcu = dev_get_drvdata(&pdev->dev); + clk_enable(dcu->clk); return 0; } #else @@ -1051,7 +1047,6 @@ static int __devinit mvf_dcu_probe(struct platform_device *pdev) } dev_set_drvdata(&pdev->dev, dcu); - return 0; failed_install_fb: |