summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
diff options
context:
space:
mode:
authorArchit Taneja <architt@codeaurora.org>2016-02-25 11:22:41 +0530
committerRob Clark <robdclark@gmail.com>2016-02-29 09:48:31 -0500
commitba3d7bf3a7abdadb803a2455b04d54a4d3b32124 (patch)
tree644faac29e3da230ba1992250f72d3765446afbc /drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
parente00012b256d402efe5cd1c17571524be645af6e4 (diff)
downloadlinux-ba3d7bf3a7abdadb803a2455b04d54a4d3b32124.tar.bz2
drm/msm/hdmi: Convert PHY files according to new design
Remove the old PHY ops managed by hdmi_platform_config and use them as ops provided by the HDMI PHY driver. Remove the old HDMI 8960 PLL code that used the top level HDMI TX mmio base. NOTE: With this commit, HDMI functionality will break until the HDMI PHY/PLL register offsets in hdmi.xml.h aren't updated to be used as separate domains. Signed-off-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/hdmi/hdmi_bridge.c')
-rw-r--r--drivers/gpu/drm/msm/hdmi/hdmi_bridge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
index 92b69ae8caf9..310d92d06229 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
@@ -95,13 +95,13 @@ static void hdmi_bridge_pre_enable(struct drm_bridge *bridge)
DBG("power up");
if (!hdmi->power_on) {
+ hdmi_phy_resource_enable(phy);
power_on(bridge);
hdmi->power_on = true;
hdmi_audio_update(hdmi);
}
- if (phy)
- phy->funcs->powerup(phy, hdmi->pixclock);
+ hdmi_phy_powerup(phy, hdmi->pixclock);
hdmi_set_mode(hdmi, true);
@@ -129,13 +129,13 @@ static void hdmi_bridge_post_disable(struct drm_bridge *bridge)
DBG("power down");
hdmi_set_mode(hdmi, false);
- if (phy)
- phy->funcs->powerdown(phy);
+ hdmi_phy_powerdown(phy);
if (hdmi->power_on) {
power_off(bridge);
hdmi->power_on = false;
hdmi_audio_update(hdmi);
+ hdmi_phy_resource_disable(phy);
}
}