Commit 2c6597c7 authored by Krishna Kurapati's avatar Krishna Kurapati Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: Fix hs_phy_irq for QUSB2 targets 



On several QUSB2 Targets, the hs_phy_irq mentioned is actually
qusb2_phy interrupt specific to QUSB2 PHY's. Rename hs_phy_irq
to qusb2_phy for such targets.

In actuality, the hs_phy_irq is also present in these targets, but
kept in for debug purposes in hw test environments. This is not
triggered by default and its functionality is mutually exclusive
to that of qusb2_phy interrupt.

Add missing hs_phy_irq's, pwr_event irq's for QUSB2 PHY targets.
Add missing ss_phy_irq on some targets which allows for remote
wakeup to work on a Super Speed link.

Also modify order of interrupts in accordance to bindings update.
Since driver looks up for interrupts by name and not by index, it
is safe to modify order of these interrupts in the DT.

Signed-off-by: default avatarKrishna Kurapati <quic_kriskura@quicinc.com>
Link: https://lore.kernel.org/r/20240125185921.5062-2-quic_kriskura@quicinc.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent b5e25ded

arch/arm64/boot/dts/qcom/ipq6018.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -418,6 +418,12 @@ usb2: usb@70f8800 { 
					  <&gcc GCC_USB1_MOCK_UTMI_CLK>;

			assigned-clock-rates = <133330000>,

					       <24000000>;



			interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "pwr_event",

					  "qusb2_phy";



			resets = <&gcc GCC_USB1_BCR>;

			status = "disabled";
@@ -630,6 +636,13 @@ usb3: usb@8af8800 { 
					       <133330000>,

					       <24000000>;



			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "pwr_event",

					  "qusb2_phy",

					  "ss_phy_irq";



			resets = <&gcc GCC_USB0_BCR>;

			status = "disabled";

arch/arm64/boot/dts/qcom/ipq8074.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -627,6 +627,13 @@ usb_0: usb@8af8800 { 
						<133330000>,

						<19200000>;



			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "pwr_event",

					  "qusb2_phy",

					  "ss_phy_irq";



			power-domains = <&gcc USB0_GDSC>;



			resets = <&gcc GCC_USB0_BCR>;
@@ -669,6 +676,13 @@ usb_1: usb@8cf8800 { 
						<133330000>,

						<19200000>;



			interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "pwr_event",

					  "qusb2_phy",

					  "ss_phy_irq";



			power-domains = <&gcc USB1_GDSC>;



			resets = <&gcc GCC_USB1_BCR>;

arch/arm64/boot/dts/qcom/msm8953.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -1160,9 +1160,12 @@ usb3: usb@70f8800 { 
			#size-cells = <1>;

			ranges;



			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,

			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "hs_phy_irq", "ss_phy_irq";

			interrupt-names = "pwr_event",

					  "qusb2_phy",

					  "ss_phy_irq";



			clocks = <&gcc GCC_USB_PHY_CFG_AHB_CLK>,

				 <&gcc GCC_USB30_MASTER_CLK>,

arch/arm64/boot/dts/qcom/msm8996.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -3408,8 +3408,12 @@ usb2: usb@76f8800 { 
			#size-cells = <1>;

			ranges;



			interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "hs_phy_irq";

			interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "pwr_event",

					  "qusb2_phy",

					  "hs_phy_irq";



			clocks = <&gcc GCC_PERIPH_NOC_USB20_AHB_CLK>,

				<&gcc GCC_USB20_MASTER_CLK>,

arch/arm64/boot/dts/qcom/msm8998.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -2132,9 +2132,12 @@ usb3: usb@a8f8800 { 
					  <&gcc GCC_USB30_MASTER_CLK>;

			assigned-clock-rates = <19200000>, <120000000>;



			interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,

			interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "hs_phy_irq", "ss_phy_irq";

			interrupt-names = "pwr_event",

					  "qusb2_phy",

					  "ss_phy_irq";



			power-domains = <&gcc USB_30_GDSC>;