Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sandor Yu <Sandor.yu@nxp.com>
To:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        andrzej.hajda@intel.com, narmstrong@baylibre.com,
        robert.foss@linaro.org, Laurent.pinchart@ideasonboard.com,
        jonas@kwiboo.se, jernej.skrabec@gmail.com, hverkuil-cisco@xs4all.nl
Cc:     Sandor.yu@nxp.com, shengjiu.wang@nxp.com, cai.huoqing@linux.dev,
        maxime@cerno.tech, harry.wentland@amd.com
Subject: [PATCH v2 4/5] drm: bridge: dw_hdmi: add reset function for PHY GEN1
Date:   Fri,  8 Apr 2022 18:32:27 +0800
Message-Id: <ab85938ee3f3b4a9482b4e2414165041d6a4c62e.1649412256.git.Sandor.yu@nxp.com>
In-Reply-To: <cover.1649412256.git.Sandor.yu@nxp.com>
References: <cover.1649412256.git.Sandor.yu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jfdY9Hlz/iPk7bCtu84/h/LrxeUMU47NKbeZsHVEzbMi4XsUO1VJGhT16CyK?=
 =?us-ascii?Q?Wg/x9gN8tfbb5Oci/MVuqFap9hGS0UScKRbaJZDWgfzIP6FcOhjBS5dyynw8?=
 =?us-ascii?Q?lLV+yjiD6KIfBec+lrYTk8Eo0TvvXbxyIrn2DRlaczv2e1xzazdVlnrkvBPC?=
 =?us-ascii?Q?kDW3wdafViRBH3/nDntG2xJR/BfGd1i+pyTYK3zragjykUrErqkGOMtB24+E?=
 =?us-ascii?Q?SZgo6GTEKT4CdT734y2zHV9KZ/rDa2gtRG3BggF4Dus2uzxwiI3+MRqbskz1?=
 =?us-ascii?Q?0becIPXEQ1QjLEbxgb0f0EmjgXOwE6NKCN8IVkRohe8+tgcaBKnWTzaGIzjx?=
 =?us-ascii?Q?NZwX25XMUFdERDt40UaUUXwaqUWFYC9KemWMJgCZjHLCRuTxJQEJLwLGmJS8?=
 =?us-ascii?Q?kJx1uEO+xkvSWFE4si7lbvpA6rb3NmUtBt4KoxKFFnhTmV5LJtTbWRNpfbcx?=
 =?us-ascii?Q?0EZ9S4CrEY0r5Hqh1mtWnMJkShzslPPEjAeOwY2CUAC2uj3TaKiq7yBR4/bV?=
 =?us-ascii?Q?edzxAN2qT6aABODBEvfsYQKLfqlEhdKHchSo/iTMua16WgP6qRbsULFyOmOY?=
 =?us-ascii?Q?jPZn3EchOcRMxTtDqxJYsps2u+7uPPRKO31diAGeUhsweytYUAKuOFa0lNzf?=
 =?us-ascii?Q?VUDeTxJT/9JcDCsMdILJY4/hNnfYJcjQQq+u1dYzhwhxkl2MuHm6LFfLoivM?=
 =?us-ascii?Q?hPSKuwqNwuHJQp1c+eqyXwoP5AAOuVPQLsX0z6ic/pa2e9JIeWifk+Ezqm3a?=
 =?us-ascii?Q?+9GiZCpDVfAavUrxyqxROTc0fPAxOa02BDLODjE+8yhTNY4fVeqXim9Cv2FO?=
 =?us-ascii?Q?zZP7wowZynapu8L/bzpZ2u50d8dqtfxCkzVSC6L/6/CjGu5puFbHcW/7IYHF?=
 =?us-ascii?Q?37gIoSHYlNsD/H4A7T1Pa64wbYXV/RXwS0z+3e5eDNU1nh0uk4vu6DEaJFpx?=
 =?us-ascii?Q?pQ1ANmjtRxXSCrj40qdp7VxbNMXSk9TaCJ8EBO4QeZrGmNJ5zGXKbvHAOnih?=
 =?us-ascii?Q?Y2iYt8l7eR3G57CjflZ9fszjpnVv8wGt3u22NmhiuEMXWbDZBqi2wfUbija3?=
 =?us-ascii?Q?EdoKlUlpqJQ6E7+Uelb0xpfaexBYiUdO7Vsb7UHtyn3XjmBzmngWcb2nBSAo?=
 =?us-ascii?Q?ROS5jqaLxoeXPScP9Stouv4tmq+2LvUFSuayTx74+C2xsJSRN5a1sHntRK4j?=
 =?us-ascii?Q?+M17LXPTUNiq/YK0WO9Mv2F+8mjf7XQy/T45UxkXNZb5kBQ3A5G+O8bR6oa0?=
 =?us-ascii?Q?TFpnEOB8qBPAhHKF8Pa9j/ptw2TVvy/wgZxLZ016PlRJxk7KbhKAkE/X0jSk?=
 =?us-ascii?Q?gHTN6ss3zzX5IejNNjUhRIAWYeWLUevwBZxVBibQPqp1uIVPZNpMId1tHSAY?=
 =?us-ascii?Q?3tr2pSiCh/HK3BWSUb4sdtRCQK59Ag6T2QPdFg8iOAmsL+5qkFjeiqZpoM2h?=
 =?us-ascii?Q?59Qd9K3T0ak/0POzhj3RDuIy30EJy2lR2X0DPRFJIbUxynUW56Y3x9+t4XdT?=
 =?us-ascii?Q?u2efENcgh/sgwi9lxVUpRzIsIjgyw6RryfIhHxWocl86sJqmnxpfPMhvCc74?=
 =?us-ascii?Q?8VZkKOybyJLNiQN9G6kwLqnfw8APWRe3BybphitQl63WJXAvBxuiNrxK8RDN?=
 =?us-ascii?Q?dw/gXOXC8H5w5W7E3mmcUAJf76QBcJKGCqvdtaRPyBdfIM1ZIqgnBfUOMSqL?=
 =?us-ascii?Q?8YM7fvMunozBLwcF9St1RTgzzX8tCDYhyLkGurpbxPwlpfoI/NMoCEv8URFt?=
 =?us-ascii?Q?0Y6PXAoqjA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b92eda1d-1342-4852-2e33-08da194b3273
X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5450.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 10:33:18.7872
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ce7ulaSeq7hg1Dfjnahaq8pAr7SHoTp+sfXDEQ8mXFfaWxZBVrPjIVWoXiVws3nPETLvuv5pRrxdsP4vUnSFkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3405
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

PHY reset register(MC_PHYRSTZ) active high reset control for PHY GEN2,
and active low reset control for PHY GEN1.

Rename function dw_hdmi_phy_reset to dw_hdmi_phy_gen2_reset.
Add dw_hdmi_phy_gen1_reset function for PHY GEN1.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 14 +++++++++++---
 drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c    |  2 +-
 include/drm/bridge/dw_hdmi.h              |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 5a7ec066e37a..13270d96e5be 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1369,13 +1369,21 @@ static void dw_hdmi_phy_sel_interface_control(struct dw_hdmi *hdmi, u8 enable)
 			 HDMI_PHY_CONF0_SELDIPIF_MASK);
 }
 
-void dw_hdmi_phy_reset(struct dw_hdmi *hdmi)
+void dw_hdmi_phy_gen1_reset(struct dw_hdmi *hdmi)
+{
+	/* PHY reset. The reset signal is active low on Gen1 PHYs. */
+	hdmi_writeb(hdmi, 0, HDMI_MC_PHYRSTZ);
+	hdmi_writeb(hdmi, HDMI_MC_PHYRSTZ_PHYRSTZ, HDMI_MC_PHYRSTZ);
+}
+EXPORT_SYMBOL_GPL(dw_hdmi_phy_gen1_reset);
+
+void dw_hdmi_phy_gen2_reset(struct dw_hdmi *hdmi)
 {
 	/* PHY reset. The reset signal is active high on Gen2 PHYs. */
 	hdmi_writeb(hdmi, HDMI_MC_PHYRSTZ_PHYRSTZ, HDMI_MC_PHYRSTZ);
 	hdmi_writeb(hdmi, 0, HDMI_MC_PHYRSTZ);
 }
-EXPORT_SYMBOL_GPL(dw_hdmi_phy_reset);
+EXPORT_SYMBOL_GPL(dw_hdmi_phy_gen2_reset);
 
 void dw_hdmi_phy_i2c_set_addr(struct dw_hdmi *hdmi, u8 address)
 {
@@ -1529,7 +1537,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi,
 	if (phy->has_svsret)
 		dw_hdmi_phy_enable_svsret(hdmi, 1);
 
-	dw_hdmi_phy_reset(hdmi);
+	dw_hdmi_phy_gen2_reset(hdmi);
 
 	hdmi_writeb(hdmi, HDMI_MC_HEACPHY_RST_ASSERT, HDMI_MC_HEACPHY_RST);
 
diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
index 5e2b0175df36..2860e6bff8b7 100644
--- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
+++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
@@ -135,7 +135,7 @@ static int sun8i_hdmi_phy_config_a83t(struct dw_hdmi *hdmi,
 	dw_hdmi_phy_gen2_txpwron(hdmi, 0);
 	dw_hdmi_phy_gen2_pddq(hdmi, 1);
 
-	dw_hdmi_phy_reset(hdmi);
+	dw_hdmi_phy_gen2_reset(hdmi);
 
 	dw_hdmi_phy_gen2_pddq(hdmi, 0);
 
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index 2a1f85f9a8a3..70082f80a8c8 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -187,9 +187,11 @@ void dw_hdmi_phy_i2c_set_addr(struct dw_hdmi *hdmi, u8 address);
 void dw_hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data,
 			   unsigned char addr);
 
+void dw_hdmi_phy_gen1_reset(struct dw_hdmi *hdmi);
+
 void dw_hdmi_phy_gen2_pddq(struct dw_hdmi *hdmi, u8 enable);
 void dw_hdmi_phy_gen2_txpwron(struct dw_hdmi *hdmi, u8 enable);
-void dw_hdmi_phy_reset(struct dw_hdmi *hdmi);
+void dw_hdmi_phy_gen2_reset(struct dw_hdmi *hdmi);
 
 enum drm_connector_status dw_hdmi_phy_read_hpd(struct dw_hdmi *hdmi,
 					       void *data);
-- 
2.25.1