[PATCH] arm64: dts: qcom: hamoa: Fix clocks for HSPHYs

[PATCH] arm64: dts: qcom: hamoa: Fix clocks for HSPHYs

[Konrad Dybcio]

From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

The tertiary controller's HSPHY has its own toggle in TCSR, while the
primary one is wired directly to the XO clock. Fix that.

Fixes: 4af46b7bd66f ("arm64: dts: qcom: x1e80100: Add USB nodes")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/hamoa.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/hamoa.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
index 4ba751a65142..fd86f4761eab 100644
--- a/arch/arm64/boot/dts/qcom/hamoa.dtsi
+++ b/arch/arm64/boot/dts/qcom/hamoa.dtsi
@@ -2868,7 +2868,7 @@ usb_1_ss0_hsphy: phy@fd3000 {
 			reg = <0 0x00fd3000 0 0x154>;
 			#phy-cells = <0>;
 
-			clocks = <&tcsr TCSR_USB2_1_CLKREF_EN>;
+			clocks = <&rpmhcc RPMH_CXO_CLK>;
 			clock-names = "ref";
 
 			resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
@@ -3010,7 +3010,7 @@ usb_1_ss2_hsphy: phy@fde000 {
 			reg = <0 0x00fde000 0 0x154>;
 			#phy-cells = <0>;
 
-			clocks = <&tcsr TCSR_USB2_1_CLKREF_EN>;
+			clocks = <&tcsr TCSR_USB2_2_CLKREF_EN>;
 			clock-names = "ref";
 
 			resets = <&gcc GCC_QUSB2PHY_TERT_BCR>;

---
base-commit: e98d21c170b01ddef366f023bbfcf6b31509fa83
change-id: 20260518-topic-hamoa_hsphy_clk-853750763bde

Best regards,
--  
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Re: [PATCH] arm64: dts: qcom: hamoa: Fix clocks for HSPHYs

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] The patch assigns the `TCSR_USB2_2_CLKREF_EN` clock to `usb_1_ss2_hsphy` (the tertiary controller's PHY). However, `usb_2_hsphy` (a separate PHY at 0x088e0000) is already assigned this exact same clock reference. This creates a hardware description conflict where two distinct PHYs share a single toggle, contradicting the commit message's claim that the tertiary PHY has its "own toggle".
--

commit 91799d7f574ab3aadbfd7f8695e82875347063f5
Author: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

arm64: dts: qcom: hamoa: Fix clocks for HSPHYs

This commit updates the clock references for the primary and tertiary HSPHYs
on hamoa. The primary PHY is wired directly to the XO clock, and the
tertiary PHY is updated to use TCSR_USB2_2_CLKREF_EN.

> diff --git a/arch/arm64/boot/dts/qcom/hamoa.dtsi b/arch/arm64/boot/dts/qcom/hamoa.dtsi
> --- a/arch/arm64/boot/dts/qcom/hamoa.dtsi
> +++ b/arch/arm64/boot/dts/qcom/hamoa.dtsi
[ ... ]
> @@ -3010,7 +3010,7 @@ usb_1_ss2_hsphy: phy@fde000 {
>  			reg = <0 0x00fde000 0 0x154>;
>  			#phy-cells = <0>;
>  
> -			clocks = <&tcsr TCSR_USB2_1_CLKREF_EN>;
> +			clocks = <&tcsr TCSR_USB2_2_CLKREF_EN>;

The commit message notes the tertiary PHY has its "own toggle", but does
assigning TCSR_USB2_2_CLKREF_EN here result in two PHYs sharing a toggle?

It appears that usb_2_hsphy (located at 0x088e0000) is already assigned this
exact same clock reference. If both usb_1_ss2_hsphy and usb_2_hsphy share
TCSR_USB2_2_CLKREF_EN in the device tree, does usb_2_hsphy also need its
clock assignment updated to correctly model the hardware?

>  			clock-names = "ref";
>  
>  			resets = <&gcc GCC_QUSB2PHY_TERT_BCR>;

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260518-topic-hamoa_hsphy_clk-v1-1-d85203756505@oss.qualcomm.com?part=1

Re: [PATCH] arm64: dts: qcom: hamoa: Fix clocks for HSPHYs

[Abel Vesa]

On 26-05-18 11:54:39, Konrad Dybcio wrote:
> From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> 
> The tertiary controller's HSPHY has its own toggle in TCSR, while the
> primary one is wired directly to the XO clock. Fix that.
> 
> Fixes: 4af46b7bd66f ("arm64: dts: qcom: x1e80100: Add USB nodes")
> Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>