diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-09-07 09:57:12 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-09-07 09:57:12 +0800 |
| commit | cbc0db0202a9d92e726de41c9884baee5190e4c1 (patch) | |
| tree | 943b80849424b5f2be814c8a31c455371c4fbfac /drivers/video | |
| parent | a45bfa0fcb4f54a4ff8e4c6785f8faa6bdf1cd8c (diff) | |
| parent | b387e1ccdaaf6f15a0c40e9738ef6eef0df83253 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35_12.09.01' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/pm.c
Diffstat (limited to 'drivers/video')
| -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); |