OSDN Git Service

drm/sti: remove deprecated sink_term config
authorVincent Abriou <vincent.abriou@st.com>
Wed, 1 Feb 2017 17:04:00 +0000 (18:04 +0100)
committerVincent Abriou <vincent.abriou@st.com>
Fri, 10 Feb 2017 08:34:39 +0000 (09:34 +0100)
stih416 chip family is no more supported in Linux v4.9.
Then sink_term config becomes useless. The field of the
register it was referring to is tag as reserved for stih410
chip family.

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
drivers/gpu/drm/sti/sti_hdmi.c

index c915184..6862d59 100644 (file)
@@ -95,7 +95,6 @@
 #define HDMI_CFG_HDCP_EN                BIT(2)
 #define HDMI_CFG_ESS_NOT_OESS           BIT(3)
 #define HDMI_CFG_H_SYNC_POL_NEG         BIT(4)
-#define HDMI_CFG_SINK_TERM_DET_EN       BIT(5)
 #define HDMI_CFG_V_SYNC_POL_NEG         BIT(6)
 #define HDMI_CFG_422_EN                 BIT(8)
 #define HDMI_CFG_FIFO_OVERRUN_CLR       BIT(12)
@@ -269,9 +268,6 @@ static void hdmi_config(struct sti_hdmi *hdmi)
        if (hdmi->hdmi_mode == HDMI_MODE_HDMI)
                conf |= HDMI_CFG_HDMI_NOT_DVI;
 
-       /* Enable sink term detection */
-       conf |= HDMI_CFG_SINK_TERM_DET_EN;
-
        /* Set Hsync polarity */
        if (hdmi->mode.flags & DRM_MODE_FLAG_NHSYNC) {
                DRM_DEBUG_DRIVER("H Sync Negative\n");
@@ -607,9 +603,6 @@ static void hdmi_dbg_cfg(struct seq_file *s, int val)
        tmp = val & HDMI_CFG_ESS_NOT_OESS;
        DBGFS_PRINT_STR("HDCP mode:", tmp ? "ESS enable" : "OESS enable");
        seq_puts(s, "\t\t\t\t\t");
-       tmp = val & HDMI_CFG_SINK_TERM_DET_EN;
-       DBGFS_PRINT_STR("Sink term detection:", tmp ? "enable" : "disable");
-       seq_puts(s, "\t\t\t\t\t");
        tmp = val & HDMI_CFG_H_SYNC_POL_NEG;
        DBGFS_PRINT_STR("Hsync polarity:", tmp ? "inverted" : "normal");
        seq_puts(s, "\t\t\t\t\t");