From: Mythri P K <[email protected]> Instead of DSS knowing of the interior IP driver function provide a wrapper API to configure.
Signed-off-by: Mythri P K <[email protected]> --- drivers/video/omap2/dss/hdmi.c | 8 ++++---- drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c | 11 ++++++++--- include/video/omaphdmi.h | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 8baf4cf..fb7d66f 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -478,13 +478,13 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) hdmi_wp_video_start(&hdmi.hdmi_data, 0); /* config the PLL and PHY hdmi_set_pll_pwrfirst */ - r = hdmi_pll_program(&hdmi.hdmi_data); + r = hdmi_pll_enable(&hdmi.hdmi_data); if (r) { DSSDBG("Failed to lock PLL\n"); goto err; } - r = hdmi_phy_init(&hdmi.hdmi_data); + r = hdmi_phy_enable(&hdmi.hdmi_data); if (r) { DSSDBG("Failed to start PHY\n"); goto err; @@ -527,8 +527,8 @@ static void hdmi_power_off(struct omap_dss_device *dssdev) dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 0); hdmi_wp_video_start(&hdmi.hdmi_data, 0); - hdmi_phy_off(&hdmi.hdmi_data); - hdmi_set_pll_pwr(&hdmi.hdmi_data, HDMI_PLLPWRCMD_ALLOFF); + hdmi_phy_disable(&hdmi.hdmi_data); + hdmi_pll_disable(&hdmi.hdmi_data); hdmi_runtime_put(); hdmi.edid_set = 0; diff --git a/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c b/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c index a582522..f64e06c 100644 --- a/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c +++ b/drivers/video/omap2/dss/hdmi_ti_4xxx_ip.c @@ -194,7 +194,7 @@ static int hdmi_pll_reset(struct hdmi_ip_data *ip_data) return 0; } -int hdmi_pll_program(struct hdmi_ip_data *ip_data) +int hdmi_pll_enable(struct hdmi_ip_data *ip_data) { u16 r = 0; enum hdmi_clk_refsel refsel; @@ -220,7 +220,12 @@ int hdmi_pll_program(struct hdmi_ip_data *ip_data) return 0; } -int hdmi_phy_init(struct hdmi_ip_data *ip_data) +void hdmi_pll_disable(struct hdmi_ip_data *ip_data) +{ + hdmi_set_pll_pwr(ip_data, HDMI_PLLPWRCMD_ALLOFF); +} + +int hdmi_phy_enable(struct hdmi_ip_data *ip_data) { u16 r = 0; void __iomem *phy_base = hdmi_phy_base(ip_data); @@ -257,7 +262,7 @@ int hdmi_phy_init(struct hdmi_ip_data *ip_data) return 0; } -void hdmi_phy_off(struct hdmi_ip_data *ip_data) +void hdmi_phy_disable(struct hdmi_ip_data *ip_data) { hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF); } diff --git a/include/video/omaphdmi.h b/include/video/omaphdmi.h index 9d4bc36..88b1ccb 100644 --- a/include/video/omaphdmi.h +++ b/include/video/omaphdmi.h @@ -83,11 +83,11 @@ struct hdmi_ip_data { struct hdmi_config cfg; struct hdmi_pll_info pll_data; }; -int hdmi_phy_init(struct hdmi_ip_data *ip_data); -void hdmi_phy_off(struct hdmi_ip_data *ip_data); +int hdmi_phy_enable(struct hdmi_ip_data *ip_data); +void hdmi_phy_disable(struct hdmi_ip_data *ip_data); int read_edid(struct hdmi_ip_data *ip_data, u8 *pedid, u16 max_length); void hdmi_wp_video_start(struct hdmi_ip_data *ip_data, bool start); -int hdmi_pll_program(struct hdmi_ip_data *ip_data); -int hdmi_set_pll_pwr(struct hdmi_ip_data *ip_data, enum hdmi_pll_pwr val); +int hdmi_pll_enable(struct hdmi_ip_data *ip_data); +void hdmi_pll_disable(struct hdmi_ip_data *ip_data); void hdmi_basic_configure(struct hdmi_ip_data *ip_data); #endif -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
