diff options
| author | Jack Lee <jack.lee@freescale.com> | 2012-10-15 15:07:49 +0800 |
|---|---|---|
| committer | Jack Lee <jack.lee@freescale.com> | 2012-10-15 15:07:49 +0800 |
| commit | 7a316704cc0b7210b3109dde7c7d7dc3df4e195a (patch) | |
| tree | 6c2e6d88f3c2fa0847d8c0c2aa0cb5959fabcd27 /drivers/video/mxc_hdmi.c | |
| parent | 63d1edebb7ba2ed2c1566883e179daa525d5895a (diff) | |
| parent | 693366100aa78dc405900b301fe41a9109e6abc0 (diff) | |
Merge commit 'rel_imx_3.0.35_12.10.02_RC1' into
imx_3.0.35_android_r13.5-beta
Conflicts:
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/mach-mx6/mx6_suspend.S
arch/arm/mach-mx6/pm.c
arch/arm/plat-mxc/cpufreq.c
drivers/video/mxc/mxc_ipuv3_fb.c
Signed-off-by: Jack Lee <jack.lee@freescale.com>
Diffstat (limited to 'drivers/video/mxc_hdmi.c')
| -rw-r--r-- | drivers/video/mxc_hdmi.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c index 9e23bdea331f..74a42aabe976 100644 --- a/drivers/video/mxc_hdmi.c +++ b/drivers/video/mxc_hdmi.c @@ -1070,7 +1070,7 @@ static int hdmi_phy_configure(struct mxc_hdmi *hdmi, unsigned char pRep, while (val == 0) { udelay(1000); if (msec-- == 0) { - dev_err(&hdmi->pdev->dev, "PHY PLL not locked\n"); + dev_dbg(&hdmi->pdev->dev, "PHY PLL not locked\n"); return false; } val = hdmi_readb(HDMI_PHY_STAT0) & HDMI_PHY_TX_PHY_LOCK; @@ -1394,28 +1394,6 @@ static int mxc_hdmi_read_edid(struct mxc_hdmi *hdmi) return HDMI_EDID_SUCCESS; } -static void mxc_hdmi_enable_pins(struct mxc_hdmi *hdmi) -{ - struct fsl_mxc_hdmi_platform_data *plat = hdmi->pdev->dev.platform_data; - - dev_dbg(&hdmi->pdev->dev, "%s\n", __func__); - - /* Enable pins to HDMI */ - if (plat->enable_pins) - plat->enable_pins(); -} - -static void mxc_hdmi_disable_pins(struct mxc_hdmi *hdmi) -{ - struct fsl_mxc_hdmi_platform_data *plat = hdmi->pdev->dev.platform_data; - - dev_dbg(&hdmi->pdev->dev, "%s\n", __func__); - - /* Disable pins to HDMI */ - if (plat->disable_pins) - plat->disable_pins(); -} - static void mxc_hdmi_phy_disable(struct mxc_hdmi *hdmi) { dev_dbg(&hdmi->pdev->dev, "%s\n", __func__); @@ -1656,7 +1634,7 @@ static void mxc_hdmi_set_mode(struct mxc_hdmi *hdmi) dev_dbg(&hdmi->pdev->dev, "%s: Video mode same as previous\n", __func__); /* update fbi mode in case modelist is updated */ - hdmi->fbi->mode = mode; + hdmi->fbi->mode = (struct fb_videomode *)mode; mxc_hdmi_phy_init(hdmi); } else { dev_dbg(&hdmi->pdev->dev, "%s: New video mode\n", __func__); @@ -2297,8 +2275,6 @@ static void mxc_hdmi_disp_deinit(struct mxc_dispdrv_handle *disp) fb_unregister_client(&hdmi->nb); - mxc_hdmi_disable_pins(hdmi); - clk_disable(hdmi->hdmi_isfr_clk); clk_put(hdmi->hdmi_isfr_clk); clk_disable(hdmi->hdmi_iahb_clk); |