Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   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 v3 3/4] drm: bridge: dw_hdmi: add reset function for PHY GEN1
Date:   Fri, 15 Apr 2022 10:42:49 +0800
Message-Id: <e0b3be2d63fe3e95246fb8b8b0dcd57415b29e04.1649989179.git.Sandor.yu@nxp.com>
In-Reply-To: <cover.1649989179.git.Sandor.yu@nxp.com>
References: <cover.1649989179.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?hj6Ybqhwp9EZ4KIw8a/3VBmrAxB534U5RafXpfGGmE65Ei/9wllj/ThSqOsb?=
 =?us-ascii?Q?/tNlYnKRG3vzT/UrAbPt34u+djq3ptOlz8B3+FyA8jRdJPn/8pDRjtsq/jrO?=
 =?us-ascii?Q?KlcyW94pZZ+rx97GxhbiA0oEeis5SPWRzMui9s6x7Wg22sVgokNOEKFeHCq4?=
 =?us-ascii?Q?cBb7xcRBE9HlBCjjDkfYhN3ATvFWLTcSu8CrJNWe0dfguqNZk+i8PnCGQp/n?=
 =?us-ascii?Q?8LtMyQJmQ3Cta4Zw0rCMIkDfDHBz1Zbow6ZQdXrkfv995q7eH/1ZXIioFUaa?=
 =?us-ascii?Q?hk3oBhgghxw39yGivGkFGLe7eKV/tStDl2oAP5p9y1t90l2vy/j9yql9PJ5Q?=
 =?us-ascii?Q?JRWiKpk267lGA8MotUMx7NcIIitMRUb0SuqIGlsprWfmLEmQ0tAHtY/5uOTM?=
 =?us-ascii?Q?jYSl4p6PjpOSNl9P3KnmldeLqp3O8zKPN42WoED8VQ8EjqmD5o6PHHrjiFYl?=
 =?us-ascii?Q?Xdqg6WtC1W5R+BPshlM52iavYmS0e6TRxTuvXlyl1CDYm6QrzJ1m7BzQHA1v?=
 =?us-ascii?Q?Nz6QoQp9dot0QOnYxBpC7KDKAqkypTAf9wynjSKCKBJ30TBb1BkIGxn3B+9T?=
 =?us-ascii?Q?YX8vGNyVVUB+02R5gAKTNj8dwVKo5iTdomyDeGuNE7RxjltPE7TLdQ8y7bdR?=
 =?us-ascii?Q?FUXP5JhmW3XTB3Buh06uz+9CRz2H2NDoa9wSi1wqbKDHPIe2EcmJYKmuzeXJ?=
 =?us-ascii?Q?CapIQYQBVKyt4OSOGSjH1Ifu4qFl7ZFhXO9QCk+wnaaHV41SAWXB6g8VjEkH?=
 =?us-ascii?Q?zcuCp6tjDYtp1o/Nsx5q6oKDNeyST6MWc7dJiYkRZya8tjNd3rhZKfVR9/i9?=
 =?us-ascii?Q?H5vVoigGnKmFVBqaDGNRgxn4NY0ukS7MH+LrMR98hQY0A3Kc3ItV6167gUYd?=
 =?us-ascii?Q?PzL8vr1GN7s/bZU7gkTVbwEJQcFH8np0B2igkfUTcPHXz2W1l5rg/iQhmaKO?=
 =?us-ascii?Q?GS9H4yY+esVi9MqStA6jiwjj1YEhjpvZELQ5FMYsun19UDwX2Wo5f3y81zUL?=
 =?us-ascii?Q?chE4sCfYzccZICzbvOIsK30HSdmtUviYJcYnWVAiKqP8ZRwKIl8K9KfUBhs+?=
 =?us-ascii?Q?FDOqlFsDtDlitgjAbZLAA+AxkNEwM0F8Cv7VpTfOvXe7EdQrqhE8dkt3FJN5?=
 =?us-ascii?Q?t5q+r6dJUOu5wzPHJvUB1eU7W5/O8ch8PqOhUdieVZz5ORPM+RXQ+gkFj00h?=
 =?us-ascii?Q?j3TEMFsS6LsQJnjhmnGF7csZapfEB7S1hLKk8bZ8BvC2UnF/HzOo8NWBzjZ1?=
 =?us-ascii?Q?+dKSEXyqOAYiyBKh1sIAaQ0gsWBS8GeMUMDgUiZiD4KHIreyrDPaiGYtXidc?=
 =?us-ascii?Q?PYySpkscUPA3aomnVl5DZKvQpzgyn6/IeBSFdyCaH8xdHXO4HH4deFpJAawM?=
 =?us-ascii?Q?zgCmpV6ULB+AuAuuAoz4fnD3pSa4jVqp00JCnZPOBT9F8R0OLYjj7gz3/WLf?=
 =?us-ascii?Q?rGSQOLAMdvQFcJw2VryTktA2tThhfJpUFdNzqEtLrhKQzLlXj5+23ohwBMXZ?=
 =?us-ascii?Q?b300/iFIVn9iv0saBzlkNrmimkLXOjBzcz3FDh9LJz0NhYYfh/0/++kIOm9d?=
 =?us-ascii?Q?Y+AIA7EhOFbymkF9Rx83af4o9QbEG1lm/akpsoTPIH0FqhXTGyDIn+Fzrxtj?=
 =?us-ascii?Q?EVQvrBHYsW6ep5EsBxxyYYRO9GbNysJNC3Jfyigj41RhUBUdHZ9IYb3lcK2U?=
 =?us-ascii?Q?0V9S68E9UzFqAWKUN1cY5v6C0lEerzuFIuWjaAc5ky2J6L19QlTN/bSePEqq?=
 =?us-ascii?Q?UEnK8G0sCg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e097da42-00e0-47c6-c549-08da1e89cb1e
X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5450.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 02:43:59.5678
 (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: lP8Mo0Rx1oDJXOEsjgsiNHwKIvAczb4NnO6+eVFPazQCuDI7CU0gyHNDdmayLc0pDo/9hQe1aKYg9pxqd9R4mw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9132
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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

From: Sandor Yu <Sandor.yu@nxp.com>

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>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.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 312500921754..ac98605a6811 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1374,13 +1374,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)
 {
@@ -1534,7 +1542,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