diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-10 16:27:20 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-10 16:27:20 +0800 |
| commit | 14839768c2e0f5448f1767729a7fe5791cd4f3dd (patch) | |
| tree | 9f69e695154d828ca8f6e81d76451843f9d543f4 /drivers/video | |
| parent | 76b225cc90ecdd50e67c4bdb79448973db49ead6 (diff) | |
| parent | f588fca89c529c559ef280a96b4c9143aec904bc (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/mxc/mxc_epdc_fb.c | 2 | ||||
| -rw-r--r-- | drivers/video/mxc_hdmi.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c index f78200887054..0b3923c2cea6 100644 --- a/drivers/video/mxc/mxc_epdc_fb.c +++ b/drivers/video/mxc/mxc_epdc_fb.c @@ -857,6 +857,7 @@ static void epdc_init_settings(struct mxc_epdc_fb_data *fb_data) /* Enable clocks to access EPDC regs */ clk_enable(fb_data->epdc_clk_axi); + clk_enable(fb_data->epdc_clk_pix); /* Reset */ __raw_writel(EPDC_CTRL_SFTRST, EPDC_CTRL_SET); @@ -1027,6 +1028,7 @@ static void epdc_init_settings(struct mxc_epdc_fb_data *fb_data) /* Disable clock */ clk_disable(fb_data->epdc_clk_axi); + clk_disable(fb_data->epdc_clk_pix); } static void epdc_powerup(struct mxc_epdc_fb_data *fb_data) diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c index ce8f1ffd6645..999e3b157211 100644 --- a/drivers/video/mxc_hdmi.c +++ b/drivers/video/mxc_hdmi.c @@ -2113,6 +2113,9 @@ static int mxc_hdmi_disp_init(struct mxc_dispdrv_handle *disp, hdmi->dft_mode_set = false; + /* Setting HDMI default to blank state */ + hdmi->blank = FB_BLANK_POWERDOWN; + setting->dev_id = mxc_hdmi_ipu_id; setting->disp_id = mxc_hdmi_disp_id; setting->if_fmt = IPU_PIX_FMT_RGB24; |