arm64: dts: ti: k3-am65-main: Remove "syscon" nodes added for pcieX_ctrl

Remove "syscon" nodes added for pcieX_ctrl and have the PCIe node
point to the parent with an offset argument. This change is as
discussed in [1].

[1] http://lore.kernel.org/r/CAL_JsqKiUcO76bo1GoepWM1TusJWoty_BRy2hFSgtEVMqtrvvQ@mail.gmail.com

Signed-off-by: Nishanth Menon <nm@ti.com>
Link: https://lore.kernel.org/r/20230424144949.244135-2-nm@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 1adba2f..bc63d10 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -481,21 +481,6 @@
                #size-cells = <1>;
                ranges = <0x0 0x0 0x00100000 0x1c000>;
 
-               pcie0_mode: pcie-mode@4060 {
-                       compatible = "syscon";
-                       reg = <0x00004060 0x4>;
-               };
-
-               pcie1_mode: pcie-mode@4070 {
-                       compatible = "syscon";
-                       reg = <0x00004070 0x4>;
-               };
-
-               pcie_devid: pcie-devid@210 {
-                       compatible = "syscon";
-                       reg = <0x00000210 0x4>;
-               };
-
                serdes0_clk: clock@4080 {
                        compatible = "syscon";
                        reg = <0x00004080 0x4>;
@@ -883,8 +868,8 @@
                #size-cells = <2>;
                ranges = <0x81000000 0 0          0x0 0x10020000 0 0x00010000>,
                         <0x82000000 0 0x10030000 0x0 0x10030000 0 0x07FD0000>;
-               ti,syscon-pcie-id = <&pcie_devid>;
-               ti,syscon-pcie-mode = <&pcie0_mode>;
+               ti,syscon-pcie-id = <&scm_conf 0x210>;
+               ti,syscon-pcie-mode = <&scm_conf 0x4060>;
                bus-range = <0x0 0xff>;
                num-viewport = <16>;
                max-link-speed = <2>;
@@ -900,7 +885,7 @@
                reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>;
                reg-names = "app", "dbics", "addr_space", "atu";
                power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
-               ti,syscon-pcie-mode = <&pcie0_mode>;
+               ti,syscon-pcie-mode = <&scm_conf 0x4060>;
                num-ib-windows = <16>;
                num-ob-windows = <16>;
                max-link-speed = <2>;
@@ -918,8 +903,8 @@
                #size-cells = <2>;
                ranges = <0x81000000 0 0          0x0   0x18020000 0 0x00010000>,
                         <0x82000000 0 0x18030000 0x0   0x18030000 0 0x07FD0000>;
-               ti,syscon-pcie-id = <&pcie_devid>;
-               ti,syscon-pcie-mode = <&pcie1_mode>;
+               ti,syscon-pcie-id = <&scm_conf 0x210>;
+               ti,syscon-pcie-mode = <&scm_conf 0x4070>;
                bus-range = <0x0 0xff>;
                num-viewport = <16>;
                max-link-speed = <2>;
@@ -935,7 +920,7 @@
                reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>;
                reg-names = "app", "dbics", "addr_space", "atu";
                power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>;
-               ti,syscon-pcie-mode = <&pcie1_mode>;
+               ti,syscon-pcie-mode = <&scm_conf 0x4070>;
                num-ib-windows = <16>;
                num-ob-windows = <16>;
                max-link-speed = <2>;