arm64: dts: ti: k3-am62p-j722s: Move AM62P specific USB1 to am62p-main.dtsi

The USB1 instance of USB controller on AM62P is different from the USB1
instance of USB controller on J722S. Thus, move the USB1 instance from
the shared "k3-am62p-j722s-common-main.dtsi" file to the AM62p specific
"k3-am62p-main.dtsi" file. Include "k3-am62p-main.dtsi" in "k3-am62p.dtsi".

Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Acked-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20240615081600.3602462-3-s-vadapalli@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
index ff97e4a59e3bf2d029bc76b067f39920a28fb706..870c95081ef5f6af5d05f9fe072e6a8659fb4fee 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
@@ -662,32 +662,6 @@
                };
        };
 
-       usbss1: usb@f910000 {
-               compatible = "ti,am62-usb";
-               reg = <0x00 0x0f910000 0x00 0x800>,
-                     <0x00 0x0f918000 0x00 0x400>;
-               clocks = <&k3_clks 162 3>;
-               clock-names = "ref";
-               ti,syscon-phy-pll-refclk = <&usb1_phy_ctrl 0x0>;
-               #address-cells = <2>;
-               #size-cells = <2>;
-               power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;
-               ranges;
-               status = "disabled";
-
-               usb1: usb@31100000 {
-                       compatible = "snps,dwc3";
-                       reg = <0x00 0x31100000 0x00 0x50000>;
-                       interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
-                       <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
-                       interrupt-names = "host", "peripheral";
-                       maximum-speed = "high-speed";
-                       dr_mode = "otg";
-                       snps,usb2-gadget-lpm-disable;
-                       snps,usb2-lpm-disable;
-               };
-       };
-
        fss: bus@fc00000 {
                compatible = "simple-bus";
                reg = <0x00 0x0fc00000 0x00 0x70000>;

diff --git a/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
new file mode 100644 (file)
index 0000000..9caab7d
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
+/*
+ * Device Tree file for the AM62P MAIN domain peripherals
+ *
+ * Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+&cbass_main {
+       usbss1: usb@f910000 {
+               compatible = "ti,am62-usb";
+               reg = <0x00 0x0f910000 0x00 0x800>,
+                     <0x00 0x0f918000 0x00 0x400>;
+               clocks = <&k3_clks 162 3>;
+               clock-names = "ref";
+               ti,syscon-phy-pll-refclk = <&usb1_phy_ctrl 0x0>;
+               #address-cells = <2>;
+               #size-cells = <2>;
+               power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;
+               ranges;
+               status = "disabled";
+
+               usb1: usb@31100000 {
+                       compatible = "snps,dwc3";
+                       reg = <0x00 0x31100000 0x00 0x50000>;
+                       interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
+                       <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
+                       interrupt-names = "host", "peripheral";
+                       maximum-speed = "high-speed";
+                       dr_mode = "otg";
+                       snps,usb2-gadget-lpm-disable;
+                       snps,usb2-lpm-disable;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/ti/k3-am62p.dtsi b/arch/arm64/boot/dts/ti/k3-am62p.dtsi
index 2d11c80107b591e67d4ee1da2ac150afa47ad9f7..75a15c368c11b068430362fe0b8d2d9ecc052588 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62p.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p.dtsi
@@ -123,3 +123,6 @@
 #include "k3-am62p-j722s-common-main.dtsi"
 #include "k3-am62p-j722s-common-mcu.dtsi"
 #include "k3-am62p-j722s-common-wakeup.dtsi"
+
+/* Include AM62P specific peripherals */
+#include "k3-am62p-main.dtsi"