These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / msm / hdmi / hdmi_phy_8960.c

diff --git a/kernel/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c b/kernel/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
index 6997ec6..3a01cb5 100644 (file)
--- a/kernel/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
+++ b/kernel/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
@@ -426,57 +426,6 @@ static void hdmi_phy_8960_destroy(struct hdmi_phy *phy)
        kfree(phy_8960);
 }
 
-static void hdmi_phy_8960_reset(struct hdmi_phy *phy)
-{
-       struct hdmi_phy_8960 *phy_8960 = to_hdmi_phy_8960(phy);
-       struct hdmi *hdmi = phy_8960->hdmi;
-       unsigned int val;
-
-       val = hdmi_read(hdmi, REG_HDMI_PHY_CTRL);
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET);
-       } else {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET);
-       }
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
-       } else {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET_PLL);
-       }
-
-       msleep(100);
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET);
-       } else {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET);
-       }
-
-       if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
-               /* pull high */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val | HDMI_PHY_CTRL_SW_RESET_PLL);
-       } else {
-               /* pull low */
-               hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
-                               val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
-       }
-}
-
 static void hdmi_phy_8960_powerup(struct hdmi_phy *phy,
                unsigned long int pixclock)
 {
@@ -511,7 +460,6 @@ static void hdmi_phy_8960_powerdown(struct hdmi_phy *phy)
 
 static const struct hdmi_phy_funcs hdmi_phy_8960_funcs = {
                .destroy = hdmi_phy_8960_destroy,
-               .reset = hdmi_phy_8960_reset,
                .powerup = hdmi_phy_8960_powerup,
                .powerdown = hdmi_phy_8960_powerdown,
 };