diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-16 16:01:51 +0300 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-11-12 13:40:26 +0200 |
commit | c2fbd061a28530dd24b2593bffa2b6a5b15eb3ed (patch) | |
tree | 7fbd458e915b1ca04e5dba58794d457af5bd498f /drivers/video/fbdev/omap2/dss/hdmi5.c | |
parent | 03aafa2cd84e6406ce3ceedca245a6a731f9b77b (diff) | |
download | op-kernel-dev-c2fbd061a28530dd24b2593bffa2b6a5b15eb3ed.zip op-kernel-dev-c2fbd061a28530dd24b2593bffa2b6a5b15eb3ed.tar.gz |
OMAPDSS: HDMI: split PLL enable & config
At the moment we have one function, hdmi_pll_enable, which enables the
PLL and writes the PLL configuration to registers.
To make the HDMI PLL ahere to the DSS PLL API, split the hdmi_pll_enable
into two parts: hdmi_pll_enable which enables the PLL HW, and
hdmi_pll_set_config which writes the config.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/hdmi5.c')
-rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi5.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index fb8c145..facc4e0 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -214,13 +214,18 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) hdmi_wp_set_irqstatus(&hdmi.wp, hdmi_wp_get_irqstatus(&hdmi.wp)); - /* config the PLL and PHY hdmi_set_pll_pwrfirst */ r = hdmi_pll_enable(&hdmi.pll); if (r) { - DSSDBG("Failed to lock PLL\n"); + DSSERR("Failed to enable PLL\n"); goto err_pll_enable; } + r = hdmi_pll_set_config(&hdmi.pll); + if (r) { + DSSERR("Failed to configure PLL\n"); + goto err_pll_cfg; + } + r = hdmi_phy_configure(&hdmi.phy, hdmi.pll.info.clkdco, hdmi.pll.info.clkout); if (r) { @@ -259,6 +264,7 @@ err_vid_enable: hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); err_phy_pwr: err_phy_cfg: +err_pll_cfg: hdmi_pll_disable(&hdmi.pll); err_pll_enable: hdmi_power_off_core(dssdev); |