diff options
author | Vincent Abriou <vincent.abriou@st.com> | 2017-02-01 12:04:00 -0500 |
---|---|---|
committer | Vincent Abriou <vincent.abriou@st.com> | 2017-02-10 03:34:39 -0500 |
commit | e6d50dc64779026c2e29e764441fd99dfe9a13f3 (patch) | |
tree | f31ce0e00ca6e3035f5bf03d785d16a391bd6e60 | |
parent | 6801723b0187c0bb0803758b7b7ef14ba22fdcf2 (diff) |
drm/sti: remove deprecated sink_term config
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>
-rw-r--r-- | drivers/gpu/drm/sti/sti_hdmi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index c9151849d604..6862d5911c18 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c | |||
@@ -95,7 +95,6 @@ | |||
95 | #define HDMI_CFG_HDCP_EN BIT(2) | 95 | #define HDMI_CFG_HDCP_EN BIT(2) |
96 | #define HDMI_CFG_ESS_NOT_OESS BIT(3) | 96 | #define HDMI_CFG_ESS_NOT_OESS BIT(3) |
97 | #define HDMI_CFG_H_SYNC_POL_NEG BIT(4) | 97 | #define HDMI_CFG_H_SYNC_POL_NEG BIT(4) |
98 | #define HDMI_CFG_SINK_TERM_DET_EN BIT(5) | ||
99 | #define HDMI_CFG_V_SYNC_POL_NEG BIT(6) | 98 | #define HDMI_CFG_V_SYNC_POL_NEG BIT(6) |
100 | #define HDMI_CFG_422_EN BIT(8) | 99 | #define HDMI_CFG_422_EN BIT(8) |
101 | #define HDMI_CFG_FIFO_OVERRUN_CLR BIT(12) | 100 | #define HDMI_CFG_FIFO_OVERRUN_CLR BIT(12) |
@@ -269,9 +268,6 @@ static void hdmi_config(struct sti_hdmi *hdmi) | |||
269 | if (hdmi->hdmi_mode == HDMI_MODE_HDMI) | 268 | if (hdmi->hdmi_mode == HDMI_MODE_HDMI) |
270 | conf |= HDMI_CFG_HDMI_NOT_DVI; | 269 | conf |= HDMI_CFG_HDMI_NOT_DVI; |
271 | 270 | ||
272 | /* Enable sink term detection */ | ||
273 | conf |= HDMI_CFG_SINK_TERM_DET_EN; | ||
274 | |||
275 | /* Set Hsync polarity */ | 271 | /* Set Hsync polarity */ |
276 | if (hdmi->mode.flags & DRM_MODE_FLAG_NHSYNC) { | 272 | if (hdmi->mode.flags & DRM_MODE_FLAG_NHSYNC) { |
277 | DRM_DEBUG_DRIVER("H Sync Negative\n"); | 273 | DRM_DEBUG_DRIVER("H Sync Negative\n"); |
@@ -607,9 +603,6 @@ static void hdmi_dbg_cfg(struct seq_file *s, int val) | |||
607 | tmp = val & HDMI_CFG_ESS_NOT_OESS; | 603 | tmp = val & HDMI_CFG_ESS_NOT_OESS; |
608 | DBGFS_PRINT_STR("HDCP mode:", tmp ? "ESS enable" : "OESS enable"); | 604 | DBGFS_PRINT_STR("HDCP mode:", tmp ? "ESS enable" : "OESS enable"); |
609 | seq_puts(s, "\t\t\t\t\t"); | 605 | seq_puts(s, "\t\t\t\t\t"); |
610 | tmp = val & HDMI_CFG_SINK_TERM_DET_EN; | ||
611 | DBGFS_PRINT_STR("Sink term detection:", tmp ? "enable" : "disable"); | ||
612 | seq_puts(s, "\t\t\t\t\t"); | ||
613 | tmp = val & HDMI_CFG_H_SYNC_POL_NEG; | 606 | tmp = val & HDMI_CFG_H_SYNC_POL_NEG; |
614 | DBGFS_PRINT_STR("Hsync polarity:", tmp ? "inverted" : "normal"); | 607 | DBGFS_PRINT_STR("Hsync polarity:", tmp ? "inverted" : "normal"); |
615 | seq_puts(s, "\t\t\t\t\t"); | 608 | seq_puts(s, "\t\t\t\t\t"); |