[PATCH v3 07/10] arm64: dts: qcom: ipq6018: Flatten usb controller nodes
From: George Moussalem via B4 Relay <devnull+george.moussalem.outlook.com@kernel.org>
Date: 2026-09-06 04:47:01
Also in:
b4-sent, linux-arm-msm, linux-usb, lkml
Subsystem:
arm/qualcomm mailing list, arm/qualcomm support, the rest · Maintainers:
Bjorn Andersson, Konrad Dybcio, Linus Torvalds
From: George Moussalem <redacted> Flatten usb controller nodes and update to using latest bindings and flattened driver approach. Signed-off-by: George Moussalem <redacted> --- arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 6 +- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 93 +++++++++++++--------------- 2 files changed, 44 insertions(+), 55 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
index a366be17c251..dfc3aac955e8 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts@@ -48,10 +48,6 @@ flash@0 { }; }; -&dwc_1 { - dr_mode = "host"; -}; - &tlmm { i2c_1_pins: i2c-1-state { pins = "gpio42", "gpio43";
@@ -88,5 +84,7 @@ &qusb_phy_1 { }; &usb2 { + dr_mode = "host"; + status = "okay"; };
diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index c02110ad9cb0..4f5f8b628bf2 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi@@ -423,12 +423,10 @@ pwm: pwm@1941010 { status = "disabled"; }; - usb2: usb@70f8800 { - compatible = "qcom,ipq6018-dwc3", "qcom,dwc3"; - reg = <0x0 0x070f8800 0x0 0x400>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + usb2: usb@7000000 { + compatible = "qcom,ipq6018-dwc3", "qcom,snps-dwc3"; + reg = <0x0 0x07000000 0x0 0xfc100>; + clocks = <&gcc GCC_USB1_MASTER_CLK>, <&gcc GCC_USB1_SLEEP_CLK>, <&gcc GCC_USB1_MOCK_UTMI_CLK>;
@@ -441,26 +439,25 @@ usb2: usb@70f8800 { assigned-clock-rates = <133330000>, <24000000>; - interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "pwr_event", + interrupt-names = "dwc_usb3", + "pwr_event", "qusb2_phy"; resets = <&gcc GCC_USB1_BCR>; - status = "disabled"; - dwc_1: usb@7000000 { - compatible = "snps,dwc3"; - reg = <0x0 0x07000000 0x0 0xcd00>; - interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; - phys = <&qusb_phy_1>; - phy-names = "usb2-phy"; - tx-fifo-resize; - snps,is-utmi-l1-suspend; - snps,hird-threshold = /bits/ 8 <0x0>; - snps,dis_u2_susphy_quirk; - snps,dis_u3_susphy_quirk; - }; + phys = <&qusb_phy_1>; + phy-names = "usb2-phy"; + + tx-fifo-resize; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + + status = "disabled"; }; sdhc: mmc@7804000 {
@@ -668,21 +665,18 @@ qpic_nand: nand-controller@79b0000 { status = "disabled"; }; - usb3: usb@8af8800 { - compatible = "qcom,ipq6018-dwc3", "qcom,dwc3"; - reg = <0x0 0x08af8800 0x0 0x400>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + usb3: usb@8a00000 { + compatible = "qcom,ipq6018-dwc3", "qcom,snps-dwc3"; + reg = <0x0 0x08a00000 0x0 0xfc100>; clocks = <&gcc GCC_SYS_NOC_USB0_AXI_CLK>, - <&gcc GCC_USB0_MASTER_CLK>, - <&gcc GCC_USB0_SLEEP_CLK>, - <&gcc GCC_USB0_MOCK_UTMI_CLK>; + <&gcc GCC_USB0_MASTER_CLK>, + <&gcc GCC_USB0_SLEEP_CLK>, + <&gcc GCC_USB0_MOCK_UTMI_CLK>; clock-names = "cfg_noc", - "core", - "sleep", - "mock_utmi"; + "core", + "sleep", + "mock_utmi"; assigned-clocks = <&gcc GCC_SYS_NOC_USB0_AXI_CLK>, <&gcc GCC_USB0_MASTER_CLK>,
@@ -691,31 +685,28 @@ usb3: usb@8af8800 { <133330000>, <24000000>; - interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, + <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", + interrupt-names = "dwc_usb3", + "pwr_event", "qusb2_phy", "ss_phy_irq"; resets = <&gcc GCC_USB0_BCR>; - status = "disabled"; - dwc_0: usb@8a00000 { - compatible = "snps,dwc3"; - reg = <0x0 0x08a00000 0x0 0xcd00>; - interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; - phys = <&qusb_phy_0>, <&ssphy_0>; - phy-names = "usb2-phy", "usb3-phy"; - clocks = <&xo>; - clock-names = "ref"; - tx-fifo-resize; - snps,parkmode-disable-ss-quirk; - snps,is-utmi-l1-suspend; - snps,hird-threshold = /bits/ 8 <0x0>; - snps,dis_u2_susphy_quirk; - snps,dis_u3_susphy_quirk; - }; + phys = <&qusb_phy_0>, <&ssphy_0>; + phy-names = "usb2-phy", "usb3-phy"; + + tx-fifo-resize; + snps,parkmode-disable-ss-quirk; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + + status = "disabled"; }; intc: interrupt-controller@b000000 {
--
2.53.0