mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 18:21:27 +00:00
68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
From c7604b72b3695ee449d16916aa474b23c53af425 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
|
|
Date: Tue, 17 Jan 2017 10:29:02 +0200
|
|
Subject: [PATCH 22/93] drm: bridge: dw-hdmi: Rename CONF0 SPARECTRL bit to
|
|
SVSRET
|
|
|
|
The bit is documented in a Rockchip BSP as
|
|
|
|
#define m_SVSRET_SIG (1 << 5) /* depend on PHY_MHL_COMB0=1 */
|
|
|
|
This is confirmed by a Renesas platform, which uses a 2.0 DWC HDMI TX as
|
|
the RK3288. Rename the bit accordingly.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
|
|
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
|
|
Signed-off-by: Archit Taneja <architt@codeaurora.org>
|
|
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-13-laurent.pinchart+renesas@ideasonboard.com
|
|
---
|
|
drivers/gpu/drm/bridge/dw-hdmi.c | 8 ++++----
|
|
drivers/gpu/drm/bridge/dw-hdmi.h | 4 ++--
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
index b4fb0bd..06c252f 100644
|
|
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
@@ -895,11 +895,11 @@ static void dw_hdmi_phy_enable_tmds(struct dw_hdmi *hdmi, u8 enable)
|
|
HDMI_PHY_CONF0_ENTMDS_MASK);
|
|
}
|
|
|
|
-static void dw_hdmi_phy_enable_spare(struct dw_hdmi *hdmi, u8 enable)
|
|
+static void dw_hdmi_phy_enable_svsret(struct dw_hdmi *hdmi, u8 enable)
|
|
{
|
|
hdmi_mask_writeb(hdmi, enable, HDMI_PHY_CONF0,
|
|
- HDMI_PHY_CONF0_SPARECTRL_OFFSET,
|
|
- HDMI_PHY_CONF0_SPARECTRL_MASK);
|
|
+ HDMI_PHY_CONF0_SVSRET_OFFSET,
|
|
+ HDMI_PHY_CONF0_SVSRET_MASK);
|
|
}
|
|
|
|
static void dw_hdmi_phy_gen2_pddq(struct dw_hdmi *hdmi, u8 enable)
|
|
@@ -1014,7 +1014,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, int cscon)
|
|
dw_hdmi_phy_gen2_pddq(hdmi, 0);
|
|
|
|
if (hdmi->dev_type == RK3288_HDMI)
|
|
- dw_hdmi_phy_enable_spare(hdmi, 1);
|
|
+ dw_hdmi_phy_enable_svsret(hdmi, 1);
|
|
|
|
/*Wait for PHY PLL lock */
|
|
msec = 5;
|
|
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.h b/drivers/gpu/drm/bridge/dw-hdmi.h
|
|
index 55135bb..08235ae 100644
|
|
--- a/drivers/gpu/drm/bridge/dw-hdmi.h
|
|
+++ b/drivers/gpu/drm/bridge/dw-hdmi.h
|
|
@@ -847,8 +847,8 @@ enum {
|
|
HDMI_PHY_CONF0_PDZ_OFFSET = 7,
|
|
HDMI_PHY_CONF0_ENTMDS_MASK = 0x40,
|
|
HDMI_PHY_CONF0_ENTMDS_OFFSET = 6,
|
|
- HDMI_PHY_CONF0_SPARECTRL_MASK = 0x20,
|
|
- HDMI_PHY_CONF0_SPARECTRL_OFFSET = 5,
|
|
+ HDMI_PHY_CONF0_SVSRET_MASK = 0x20,
|
|
+ HDMI_PHY_CONF0_SVSRET_OFFSET = 5,
|
|
HDMI_PHY_CONF0_GEN2_PDDQ_MASK = 0x10,
|
|
HDMI_PHY_CONF0_GEN2_PDDQ_OFFSET = 4,
|
|
HDMI_PHY_CONF0_GEN2_TXPWRON_MASK = 0x8,
|
|
--
|
|
1.9.1
|
|
|