diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-16 15:31:38 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-11-12 13:40:26 +0200 |
| commit | 03aafa2cd84e6406ce3ceedca245a6a731f9b77b (patch) | |
| tree | a1a72e150af63f1bd55507e30c330853dd7d15de /drivers/video/fbdev/omap2/dss/hdmi5.c | |
| parent | b0295f165f0a9e1bde4f4592df04e85a28be2ce3 (diff) | |
| download | lwn-03aafa2cd84e6406ce3ceedca245a6a731f9b77b.tar.gz lwn-03aafa2cd84e6406ce3ceedca245a6a731f9b77b.zip | |
OMAPDSS: HDMI: store WP pointer to hdmi_pll_data
HDMI PLL code needs the pointer to the WP block so that it can manage
its power. Currently this is passed as a function parameter to
hdmi_pll_enable and hdmi_pll_disable. To make the PLL function adhere to
the DSS PLL API, we need to remove the WP parameter.
This patch stores the WP pointer to hdmi_pll_data in hdmi_pll_init, so
that it's available when needed.
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index e8ca9106c8af..fb8c14507a4d 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -215,7 +215,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev) hdmi_wp_get_irqstatus(&hdmi.wp)); /* config the PLL and PHY hdmi_set_pll_pwrfirst */ - r = hdmi_pll_enable(&hdmi.pll, &hdmi.wp); + r = hdmi_pll_enable(&hdmi.pll); if (r) { DSSDBG("Failed to lock PLL\n"); goto err_pll_enable; @@ -259,7 +259,7 @@ err_vid_enable: hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); err_phy_pwr: err_phy_cfg: - hdmi_pll_disable(&hdmi.pll, &hdmi.wp); + hdmi_pll_disable(&hdmi.pll); err_pll_enable: hdmi_power_off_core(dssdev); return -EIO; @@ -277,7 +277,7 @@ static void hdmi_power_off_full(struct omap_dss_device *dssdev) hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF); - hdmi_pll_disable(&hdmi.pll, &hdmi.wp); + hdmi_pll_disable(&hdmi.pll); hdmi_power_off_core(dssdev); } @@ -717,7 +717,7 @@ static int omapdss_hdmihw_probe(struct platform_device *pdev) if (r) return r; - r = hdmi_pll_init(pdev, &hdmi.pll); + r = hdmi_pll_init(pdev, &hdmi.pll, &hdmi.wp); if (r) return r; |