Revert "FROMLIST: arm64: dts: qcom: talos: Flatten usb controller nodes"

This reverts commit 94c4503.
Reason for revert: compilation issue due to mismatch of USB phy node.

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>

Author: Kriskura176767

arch/arm64/boot/dts/qcom/qcs615-ride.dts

@@ -670,11 +670,13 @@
 };
 
 &usb_1 {
-	dr_mode = "peripheral";
-
 	status = "okay";
 };
 
+&usb_1_dwc3 {
+	dr_mode = "peripheral";
+};
+
 &usb_2_hsphy {
 	vdd-supply = <&vreg_l5a>;
 	vdda-pll-supply = <&vreg_l12a>;
@@ -684,11 +686,13 @@
 };
 
 &usb_2 {
-	dr_mode = "host";
-
 	status = "okay";
 };
 
+&usb_2_dwc3 {
+	dr_mode = "host";
+};
+
 &ufs_mem_hc {
 	reset-gpios = <&tlmm 123 GPIO_ACTIVE_LOW>;
 	vcc-supply = <&vreg_l17a>;

arch/arm64/boot/dts/qcom/talos-evk-som.dtsi

@@ -555,11 +555,13 @@
  */
 
 &usb_1 {
-	dr_mode = "host";
-
 	status = "okay";
 };
 
+&usb_1_dwc3 {
+	dr_mode = "host";
+};
+
 &usb_1_hsphy {
 	vdd-supply = <&vreg_l5a>;
 	vdda-pll-supply = <&vreg_l12a>;
@@ -569,11 +571,13 @@
 };
 
 &usb_2 {
-	dr_mode = "host";
-
 	status = "okay";
 };
 
+&usb_2_dwc3 {
+	dr_mode = "host";
+};
+
 &usb_2_hsphy {
 	vdd-supply = <&vreg_l5a>;
 	vdda-pll-supply = <&vreg_l12a>;

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

@@ -4956,9 +4956,9 @@
 			status = "disabled";
 		};
 
-		usb_1: usb@a600000 {
-			compatible = "qcom,qcs615-dwc3", "qcom,snps-dwc3";
-			reg = <0x0 0x0a600000 0x0 0xfc100>;
+		usb_1: usb@a6f8800 {
+			compatible = "qcom,qcs615-dwc3", "qcom,dwc3";
+			reg = <0x0 0x0a6f8800 0x0 0x400>;
 
 			clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
 				 <&gcc GCC_USB30_PRIM_MASTER_CLK>,
@@ -4977,47 +4977,52 @@
 					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <200000000>;
 
-			interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>,
-					      <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
+			interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&pdc 9 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 8 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 6 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "dwc_usb3",
-					  "pwr_event",
+			interrupt-names = "pwr_event",
 					  "hs_phy_irq",
 					  "dp_hs_phy_irq",
 					  "dm_hs_phy_irq",
 					  "ss_phy_irq";
 
-			iommus = <&apps_smmu 0x140 0x0>;
 			power-domains = <&gcc USB30_PRIM_GDSC>;
 			required-opps = <&rpmhpd_opp_nom>;
 
-			phys = <&usb_hsphy_1>, <&usb_qmpphy>;
-			phy-names = "usb2-phy", "usb3-phy";
-
 			resets = <&gcc GCC_USB30_PRIM_BCR>;
 
 			#address-cells = <2>;
 			#size-cells = <2>;
 			ranges;
 
-			snps,dis-u1-entry-quirk;
-			snps,dis-u2-entry-quirk;
-			snps,dis_u2_susphy_quirk;
-			snps,dis_u3_susphy_quirk;
-			snps,dis_enblslpm_quirk;
-			snps,has-lpm-erratum;
-			snps,hird-threshold = /bits/ 8 <0x10>;
-			snps,usb3_lpm_capable;
-
 			status = "disabled";
+
+			usb_1_dwc3: usb@a600000 {
+				compatible = "snps,dwc3";
+				reg = <0x0 0x0a600000 0x0 0xcd00>;
+
+				iommus = <&apps_smmu 0x140 0x0>;
+				interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>;
+
+				phys = <&usb_1_hsphy>, <&usb_qmpphy>;
+				phy-names = "usb2-phy", "usb3-phy";
+
+				snps,dis-u1-entry-quirk;
+				snps,dis-u2-entry-quirk;
+				snps,dis_u2_susphy_quirk;
+				snps,dis_u3_susphy_quirk;
+				snps,dis_enblslpm_quirk;
+				snps,has-lpm-erratum;
+				snps,hird-threshold = /bits/ 8 <0x10>;
+				snps,usb3_lpm_capable;
+			};
 		};
 
-		usb_2: usb@a800000 {
-			compatible = "qcom,qcs615-dwc3", "qcom,snps-dwc3";
-			reg = <0x0 0x0a800000 0x0 0xfc100>;
+		usb_2: usb@a8f8800 {
+			compatible = "qcom,qcs615-dwc3", "qcom,dwc3";
+			reg = <0x0 0x0a8f8800 0x0 0x400>;
 
 			clocks = <&gcc GCC_CFG_NOC_USB2_SEC_AXI_CLK>,
 				 <&gcc GCC_USB20_SEC_MASTER_CLK>,
@@ -5036,24 +5041,18 @@
 					  <&gcc GCC_USB20_SEC_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <200000000>;
 
-			interrupts-extended = <&intc GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>,
-					      <&intc GIC_SPI 663 IRQ_TYPE_LEVEL_HIGH 0>,
+			interrupts-extended = <&intc GIC_SPI 663 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&intc GIC_SPI 662 IRQ_TYPE_LEVEL_HIGH 0>,
 					      <&pdc 11 IRQ_TYPE_EDGE_BOTH>,
 					      <&pdc 10 IRQ_TYPE_EDGE_BOTH>;
-			interrupt-names = "dwc_usb3",
-					  "pwr_event",
+			interrupt-names = "pwr_event",
 					  "hs_phy_irq",
 					  "dp_hs_phy_irq",
 					  "dm_hs_phy_irq";
 
-			iommus = <&apps_smmu 0xe0 0x0>;
 			power-domains = <&gcc USB20_SEC_GDSC>;
 			required-opps = <&rpmhpd_opp_nom>;
 
-			phys = <&usb_hsphy_2>;
-			phy-names = "usb2-phy";
-
 			resets = <&gcc GCC_USB20_SEC_BCR>;
 
 			qcom,select-utmi-as-pipe-clk;
@@ -5062,14 +5061,26 @@
 			#size-cells = <2>;
 			ranges;
 
-			snps,dis_u2_susphy_quirk;
-			snps,dis_u3_susphy_quirk;
-			snps,dis_enblslpm_quirk;
-			snps,has-lpm-erratum;
-			snps,hird-threshold = /bits/ 8 <0x10>;
-			maximum-speed = "high-speed";
-
 			status = "disabled";
+
+			usb_2_dwc3: usb@a800000 {
+				compatible = "snps,dwc3";
+				reg = <0x0 0x0a800000 0x0 0xcd00>;
+
+				iommus = <&apps_smmu 0xe0 0x0>;
+				interrupts = <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>;
+
+				phys = <&usb_2_hsphy>;
+				phy-names = "usb2-phy";
+
+				snps,dis_u2_susphy_quirk;
+				snps,dis_u3_susphy_quirk;
+				snps,dis_enblslpm_quirk;
+				snps,has-lpm-erratum;
+				snps,hird-threshold = /bits/ 8 <0x10>;
+
+				maximum-speed = "high-speed";
+			};
 		};
 
 		tsens0: thermal-sensor@c263000 {