arm64: dts: qcom: sm8550: Flatten the USB nodes

Transition the USB controllers found in the SM8550 SoC to the newly
introduced, flattened representation of the Qualcomm USB block.

The reg and interrupts properties from the usb child node are merged
with their counterpart in the outer node, remaining properties and child
nodes are simply moved.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250811-topic-sm8x50-usb-flatten-v2-1-0bbb3ac292e4@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index a4ca06679c2f1eebacdd5938e380981c1b17925b..38d139d1dd4a994287c03d064ca01d59a11ac771 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -4084,12 +4084,11 @@
                        };
                };
 
-               usb_1: usb@a6f8800 {
-                       compatible = "qcom,sm8550-dwc3", "qcom,dwc3";
-                       reg = <0x0 0x0a6f8800 0x0 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
+               usb_1: usb@a600000 {
+                       compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";
+                       reg = <0x0 0x0a600000 0x0 0xfc100>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
 
                        clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
                                 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ -4108,12 +4107,14 @@
                                          <&gcc GCC_USB30_PRIM_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <200000000>;
 
-                       interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+                                             <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
                                              <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
                                              <&pdc 14 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 15 IRQ_TYPE_EDGE_BOTH>,
                                              <&pdc 17 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "pwr_event",
+                       interrupt-names = "dwc_usb3",
+                                         "pwr_event",
                                          "hs_phy_irq",
                                          "dp_hs_phy_irq",
                                          "dm_hs_phy_irq",
@@ -4130,47 +4131,46 @@
                                         &config_noc SLAVE_USB3_0 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
-                       status = "disabled";
+                       iommus = <&apps_smmu 0x40 0x0>;
 
-                       usb_1_dwc3: usb@a600000 {
-                               compatible = "snps,dwc3";
-                               reg = <0x0 0x0a600000 0x0 0xcd00>;
-                               interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                               iommus = <&apps_smmu 0x40 0x0>;
-                               phys = <&usb_1_hsphy>,
-                                      <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>;
-                               phy-names = "usb2-phy", "usb3-phy";
-                               snps,hird-threshold = /bits/ 8 <0x0>;
-                               snps,usb2-gadget-lpm-disable;
-                               snps,dis_u2_susphy_quirk;
-                               snps,dis_enblslpm_quirk;
-                               snps,dis-u1-entry-quirk;
-                               snps,dis-u2-entry-quirk;
-                               snps,is-utmi-l1-suspend;
-                               snps,usb3_lpm_capable;
-                               snps,usb2-lpm-disable;
-                               snps,has-lpm-erratum;
-                               tx-fifo-resize;
-                               dma-coherent;
-                               usb-role-switch;
+                       phys = <&usb_1_hsphy>,
+                              <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>;
+                       phy-names = "usb2-phy", "usb3-phy";
 
-                               ports {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
+                       snps,hird-threshold = /bits/ 8 <0x0>;
+                       snps,usb2-gadget-lpm-disable;
+                       snps,dis_u2_susphy_quirk;
+                       snps,dis_enblslpm_quirk;
+                       snps,dis-u1-entry-quirk;
+                       snps,dis-u2-entry-quirk;
+                       snps,is-utmi-l1-suspend;
+                       snps,usb3_lpm_capable;
+                       snps,usb2-lpm-disable;
+                       snps,has-lpm-erratum;
+                       tx-fifo-resize;
 
-                                       port@0 {
-                                               reg = <0>;
+                       dma-coherent;
 
-                                               usb_1_dwc3_hs: endpoint {
-                                               };
+                       usb-role-switch;
+
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+
+                                       usb_1_dwc3_hs: endpoint {
                                        };
+                               };
 
-                                       port@1 {
-                                               reg = <1>;
+                               port@1 {
+                                       reg = <1>;
 
-                                               usb_1_dwc3_ss: endpoint {
-                                                       remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
-                                               };
+                                       usb_1_dwc3_ss: endpoint {
+                                               remote-endpoint = <&usb_dp_qmpphy_usb_ss_in>;
                                        };
                                };
                        };