summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-11-10 12:28:57 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-11-12 13:40:25 +0200
commitb0295f165f0a9e1bde4f4592df04e85a28be2ce3 (patch)
treedae33d0e8109fcfb9d68538888ccdbb01ab1c1ab /drivers/video
parent33f13120e59cb4eddedc09039d8602d94aa864b4 (diff)
downloadop-kernel-dev-b0295f165f0a9e1bde4f4592df04e85a28be2ce3.zip
op-kernel-dev-b0295f165f0a9e1bde4f4592df04e85a28be2ce3.tar.gz
OMAPDSS: HDMI: Remove HDMI PLL reset
The SYSRESET bits in HDMI PLL do not reset the PLL itself, but only affect the power used for the PLL. Afaik there is no reason to use the SYSRESET bits, and we don't use it in the other PLLs, so let's remove the HDMI PLL reset to make the PLL code simpler and similar to other PLLs. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_pll.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
index f04d435..0942bdc 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
@@ -166,21 +166,6 @@ static int hdmi_pll_config(struct hdmi_pll_data *pll)
return 0;
}
-static int hdmi_pll_reset(struct hdmi_pll_data *pll)
-{
- /* SYSRESET controlled by power FSM */
- REG_FLD_MOD(pll->base, PLLCTRL_PLL_CONTROL, pll_feat->sys_reset, 3, 3);
-
- /* READ 0x0 reset is in progress */
- if (hdmi_wait_for_bit_change(pll->base, PLLCTRL_PLL_STATUS, 0, 0, 1)
- != 1) {
- DSSERR("Failed to sysreset PLL\n");
- return -ETIMEDOUT;
- }
-
- return 0;
-}
-
int hdmi_pll_enable(struct hdmi_pll_data *pll, struct hdmi_wp_data *wp)
{
u16 r = 0;
@@ -193,10 +178,6 @@ int hdmi_pll_enable(struct hdmi_pll_data *pll, struct hdmi_wp_data *wp)
if (r)
return r;
- r = hdmi_pll_reset(pll);
- if (r)
- return r;
-
r = hdmi_pll_config(pll);
if (r)
return r;
OpenPOWER on IntegriCloud