From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80F06C5B572 for ; Thu, 13 Aug 2026 20:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Aexy+P9U/O2Z4VLkgt9Z3gCJHpoFTbN5kqoL1F6XmD4=; b=JWE60ydLycnmDrlAFAbCzDPTkj md6U1bQNz41jNdn+GvqIicRVx6OERIiIud8gN/ozyu9JAK+xkGonR4RB+Ijn7oQ/0UjlVRVyZuJ4/ esVzrWj4xfHDflEThHd8fl5Eqilr1kfc4iaK4cFt9xTDFhV+AxPIHxIMHktnPhWKV89EH1ze/O9gI yWkfbEUCa4uIwvUzPAe3MupicCnVBLP2arYnwpR/VAb4eEQHpJo7tsdxpHp/mlO0CEJZQR+UE+5v9 cQasf4y8s7cQnO67Um3AXnc/aPaXO4XMb413kSOmrydY20qgpvQTRVNwPKI6iF2opXW+vMhY4zkdt tYngD5ww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wucV3-00000001b8d-0HuU; Thu, 13 Aug 2026 20:58:05 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wucUp-00000001axl-0AsI; Thu, 13 Aug 2026 20:57:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1786654668; bh=MbaoB2u212v2lpDmV6S57KaFx8UDmve8fbrbZtq4EOc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=edMasBCM34YwszWL0LI9+rPLXHTIEnwrjYL3Z2PuI99tZXL7ayw/xadSJy6KXlaTS 5LFuc90HC+5S3CsZ86KMeaFjBw7nXLmCxSqc93nLOzWDiHRlPyyIGu//lQZ++9LxQy 3r6HGVU5Q/COQRTgRB8+3JsqkIKZkMrWE8BjwYmB5mzinpnusHFnjnEdVLfICxgqfj y0Bp0A2zsc5ELHw+ySmHTInl1/T6YGdjG05THhLFFSN4uE2f5nnjK5ctw4UHhT3O1p ETaoKEHyjhHy39y4lTQZMxItPTMrukZF1DoYp31J3YkTz625Mh69KXCx+7VxVWiW3n q7fXLFSyf1b8g== Received: from jupiter.universe (unknown [100.64.1.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id 97D3517E107E; Thu, 13 Aug 2026 22:57:48 +0200 (CEST) Received: by jupiter.universe (Postfix, from userid 1000) id CB1D148007A; Thu, 13 Aug 2026 22:51:49 +0200 (CEST) From: Sebastian Reichel Date: Thu, 13 Aug 2026 22:52:18 +0200 Subject: [PATCH v14 35/38] phy: rockchip: usbdp: Rename mode to hw_mode MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260813-rockchip-usbdp-cleanup-v14-35-b5ad9c68fa11@collabora.com> References: <20260813-rockchip-usbdp-cleanup-v14-0-b5ad9c68fa11@collabora.com> In-Reply-To: <20260813-rockchip-usbdp-cleanup-v14-0-b5ad9c68fa11@collabora.com> To: Vinod Koul , Manivannan Sadhasivam , Neil Armstrong , Heiko Stuebner , Frank Wang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thinh Nguyen , Greg Kroah-Hartman , Philipp Zabel Cc: Andy Yan , Dmitry Baryshkov , Yubing Zhang , Alexey Charkov , Igor Paunovic , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, Sebastian Reichel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7035; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=MbaoB2u212v2lpDmV6S57KaFx8UDmve8fbrbZtq4EOc=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGp+LmUYhBwy74F13Kf7xUCVW5uutKL4spmop /G45ofaRLdQ/IkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJqfi5lAAoJENju1/PI O/qawBgP/2XYYf6MxzLBZANdAVOnCXEbNFsDfRe+x9OE66uW2v0IaLH1VkbMvXW5/nZVRPNdauW Ie9in82wW1mcL1NHXk/vr5uVB0WGVy/VYR3NF7gduDfiFmqDrvnVj76r3fYqXrGhL6uU4EyMkZV UwOAwOC29t79lH3SwWM6lKKgeRvg5vXVBMH8wn2KaV0fJi6EYhBWwVFgIT3FpMDHAKmpH5GFamE Nl6m51JWvF8uoF6O5Wg9tG8RZxtxlo6boBu02M8bt1J4ITmFbCNvYz1jyJ383GYo1U/LYsdhGdg YHb7se5ICXpI54OV8zzhbF6hTDJ2zXEcYvX1NTbl4qznQ1L6khhaf1imt0cUtKatQ40KBrPROoL 31zXzwBNSjwThodq4qke247btWRpsNAncYCASQKHphrcsD0elqANhMES2sjjszzSOMLhiQNOGwA VAoG38C7FrQGRMUJK6SB7V+Zyo1HAEQnm5dwtwVTq1neFQ7JhIVm4v21ARb6QJrWs4LZk3DyoeU q7Qk5CGUSiPKfX+4im0ulE25H5LjwDicg7NuttEJ71bHYOEOlfpktnBH4h/+nJEykx+4depx9tm t3Cr+Fd0DezzfxVF0TcwsiFT+DOyboVGrBycHAqXmUbe5+bUhi2BugOavSt3D3ULcjyZrcRm9sI LTeCxkcJ9QE2V9OaMNa8xVQ== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260813_135751_238328_B6833809 X-CRM114-Status: GOOD ( 17.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename mode field to hw_mode to make clear that this is the modes currently supported by the hardware, but not necessarily requested by software. I.e. it is only set by either the USB-C state machine or device-tree if the PHY is used in a fixed routing setup. Tested-by: Igor Paunovic # Orange Pi 5 Plus Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c index a6fe634574bb..405b3d943602 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -174,7 +174,7 @@ struct rk_udphy { /* PHY status management */ bool flip; bool phy_needs_reinit; - u8 mode; + u8 hw_mode; /* modes currently supported by hardware */ u8 status; /* utilized for USB */ @@ -579,18 +579,18 @@ static void rk_udphy_dp_lane_enable(struct rk_udphy *udphy, int dp_lanes) CMN_DP_CMN_RSTN, FIELD_PREP(CMN_DP_CMN_RSTN, 0x0)); } -static void rk_udphy_mode_set(struct rk_udphy *udphy, u8 mode) +static void rk_udphy_mode_set(struct rk_udphy *udphy, u8 hw_mode) { - if (udphy->mode == mode) + if (udphy->hw_mode == hw_mode) return; udphy->phy_needs_reinit = true; - udphy->mode = mode; + udphy->hw_mode = hw_mode; } static void rk_udphy_set_typec_state(struct rk_udphy *udphy, unsigned long state) { - u8 mode; + u8 hw_mode; switch (state) { case TYPEC_DP_STATE_C: @@ -599,7 +599,7 @@ static void rk_udphy_set_typec_state(struct rk_udphy *udphy, unsigned long state udphy->lane_mux_sel[1] = PHY_LANE_MUX_DP; udphy->lane_mux_sel[2] = PHY_LANE_MUX_DP; udphy->lane_mux_sel[3] = PHY_LANE_MUX_DP; - mode = UDPHY_MODE_DP; + hw_mode = UDPHY_MODE_DP; udphy->dp_lanes = 4; break; @@ -616,12 +616,12 @@ static void rk_udphy_set_typec_state(struct rk_udphy *udphy, unsigned long state udphy->lane_mux_sel[2] = PHY_LANE_MUX_DP; udphy->lane_mux_sel[3] = PHY_LANE_MUX_DP; } - mode = UDPHY_MODE_DP_USB; + hw_mode = UDPHY_MODE_DP_USB; udphy->dp_lanes = 2; break; } - rk_udphy_mode_set(udphy, mode); + rk_udphy_mode_set(udphy, hw_mode); } static void rk_udphy_set_typec_default_mapping(struct rk_udphy *udphy) @@ -744,7 +744,7 @@ static int rk_udphy_status_check(struct rk_udphy *udphy) int ret; /* LCPLL check */ - if (udphy->mode & UDPHY_MODE_USB) { + if (udphy->hw_mode & UDPHY_MODE_USB) { ret = regmap_read_poll_timeout(udphy->pma_regmap, CMN_ANA_LCPLL_DONE_OFFSET, val, (val & CMN_ANA_LCPLL_AFC_DONE) && (val & CMN_ANA_LCPLL_LOCK_DONE), 200, 100000); @@ -779,15 +779,15 @@ static int rk_udphy_init(struct rk_udphy *udphy) int ret; dev_dbg(udphy->dev, "reinit PHY with USB3=%s and DP=%s (%u lanes) flipped=%s\n", - str_on_off(udphy->mode & UDPHY_MODE_USB), - str_on_off(udphy->mode & UDPHY_MODE_DP), + str_on_off(udphy->hw_mode & UDPHY_MODE_USB), + str_on_off(udphy->hw_mode & UDPHY_MODE_DP), udphy->dp_lanes, str_yes_no(udphy->flip)); rk_udphy_reset_assert_all(udphy); usleep_range(10000, 11000); /* enable rx lfps for usb */ - if (udphy->mode & UDPHY_MODE_USB) + if (udphy->hw_mode & UDPHY_MODE_USB) rk_udphy_grfreg_write(udphy->udphygrf, &cfg->grfcfg.rx_lfps, true); /* Step 1: power on pma and deassert apb rstn */ @@ -824,13 +824,13 @@ static int rk_udphy_init(struct rk_udphy *udphy) FIELD_PREP(CMN_DP_LANE_EN_ALL, 0)); /* Step 4: deassert init rstn and wait for 200ns from datasheet */ - if (udphy->mode & UDPHY_MODE_USB) { + if (udphy->hw_mode & UDPHY_MODE_USB) { ret = rk_udphy_reset_deassert(udphy, "init"); if (ret) goto assert_resets; } - if (udphy->mode & UDPHY_MODE_DP) { + if (udphy->hw_mode & UDPHY_MODE_DP) { regmap_update_bits(udphy->pma_regmap, CMN_DP_RSTN_OFFSET, CMN_DP_INIT_RSTN, FIELD_PREP(CMN_DP_INIT_RSTN, 0x1)); @@ -839,7 +839,7 @@ static int rk_udphy_init(struct rk_udphy *udphy) udelay(1); /* Step 5: deassert cmn/lane rstn */ - if (udphy->mode & UDPHY_MODE_USB) { + if (udphy->hw_mode & UDPHY_MODE_USB) { ret = rk_udphy_reset_deassert(udphy, "cmn"); if (ret) goto assert_resets; @@ -898,7 +898,7 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy *udphy) num_lanes = device_property_count_u32(udphy->dev, "rockchip,dp-lane-mux"); if (num_lanes < 0) { dev_dbg(udphy->dev, "no dp-lane-mux, following dp alt mode\n"); - udphy->mode = UDPHY_MODE_USB; + udphy->hw_mode = UDPHY_MODE_USB; return 0; } @@ -927,10 +927,10 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy *udphy) } } - udphy->mode = UDPHY_MODE_DP; + udphy->hw_mode = UDPHY_MODE_DP; udphy->dp_lanes = num_lanes; if (num_lanes == 1 || num_lanes == 2) { - udphy->mode |= UDPHY_MODE_USB; + udphy->hw_mode |= UDPHY_MODE_USB; udphy->flip = (udphy->lane_mux_sel[0] == PHY_LANE_MUX_DP) || (udphy->lane_mux_sel[1] == PHY_LANE_MUX_DP); } @@ -989,7 +989,7 @@ static int rk_udphy_power_on(struct rk_udphy *udphy, u8 mode) { int ret; - if (!(udphy->mode & mode)) { + if (!(udphy->hw_mode & mode)) { dev_info(udphy->dev, "mode 0x%02x is not support\n", mode); return 0; } @@ -1006,7 +1006,7 @@ static int rk_udphy_power_on(struct rk_udphy *udphy, u8 mode) return ret; } - if (!udphy->hs && udphy->mode & UDPHY_MODE_USB) + if (!udphy->hs && udphy->hw_mode & UDPHY_MODE_USB) rk_udphy_u3_port_disable(udphy, false); udphy->phy_needs_reinit = false; @@ -1023,7 +1023,7 @@ static int rk_udphy_power_on(struct rk_udphy *udphy, u8 mode) return ret; } - if (!udphy->hs && udphy->mode & UDPHY_MODE_USB) + if (!udphy->hs && udphy->hw_mode & UDPHY_MODE_USB) rk_udphy_u3_port_disable(udphy, false); udphy->phy_needs_reinit = false; @@ -1037,7 +1037,7 @@ static int rk_udphy_power_on(struct rk_udphy *udphy, u8 mode) static void rk_udphy_power_off(struct rk_udphy *udphy, u8 mode) { - if (!(udphy->mode & mode)) { + if (!(udphy->hw_mode & mode)) { dev_info(udphy->dev, "mode 0x%02x is not support\n", mode); return; } @@ -1296,7 +1296,7 @@ static int rk_udphy_usb3_phy_init(struct phy *phy) guard(mutex)(&udphy->mutex); /* DP only or high-speed, disable U3 port */ - if (!(udphy->mode & UDPHY_MODE_USB) || udphy->hs) { + if (!(udphy->hw_mode & UDPHY_MODE_USB) || udphy->hs) { rk_udphy_u3_port_disable(udphy, true); return 0; } @@ -1311,7 +1311,7 @@ static int rk_udphy_usb3_phy_exit(struct phy *phy) guard(mutex)(&udphy->mutex); /* DP only or high-speed */ - if (!(udphy->mode & UDPHY_MODE_USB) || udphy->hs) + if (!(udphy->hw_mode & UDPHY_MODE_USB) || udphy->hs) return 0; rk_udphy_power_off(udphy, UDPHY_MODE_USB); -- 2.53.0