Commit edb96779 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Nishanth Menon

arm64: dts: ti: k3-j721e-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.comSigned-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20210105151421.23237-3-kishon@ti.com
parent 0e3cfb86
...@@ -28,38 +28,6 @@ scm_conf: scm-conf@100000 { ...@@ -28,38 +28,6 @@ scm_conf: scm-conf@100000 {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x0 0x00100000 0x1c000>; ranges = <0x0 0x0 0x00100000 0x1c000>;
pcie0_ctrl: syscon@4070 {
compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
reg = <0x00004070 0x4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x4070 0x4070 0x4>;
};
pcie1_ctrl: syscon@4074 {
compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
reg = <0x00004074 0x4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x4074 0x4074 0x4>;
};
pcie2_ctrl: syscon@4078 {
compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
reg = <0x00004078 0x4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x4078 0x4078 0x4>;
};
pcie3_ctrl: syscon@407c {
compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
reg = <0x0000407c 0x4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x407c 0x407c 0x4>;
};
serdes_ln_ctrl: mux@4080 { serdes_ln_ctrl: mux@4080 {
compatible = "mmio-mux"; compatible = "mmio-mux";
reg = <0x00004080 0x50>; reg = <0x00004080 0x50>;
...@@ -618,7 +586,7 @@ pcie0_rc: pcie@2900000 { ...@@ -618,7 +586,7 @@ pcie0_rc: pcie@2900000 {
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 318 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 318 IRQ_TYPE_EDGE_RISING>;
device_type = "pci"; device_type = "pci";
ti,syscon-pcie-ctrl = <&pcie0_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x4070>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 239 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 239 TI_SCI_PD_EXCLUSIVE>;
...@@ -645,7 +613,7 @@ pcie0_ep: pcie-ep@2900000 { ...@@ -645,7 +613,7 @@ pcie0_ep: pcie-ep@2900000 {
reg-names = "intd_cfg", "user_cfg", "reg", "mem"; reg-names = "intd_cfg", "user_cfg", "reg", "mem";
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 318 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 318 IRQ_TYPE_EDGE_RISING>;
ti,syscon-pcie-ctrl = <&pcie0_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x4070>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 239 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 239 TI_SCI_PD_EXCLUSIVE>;
...@@ -666,7 +634,7 @@ pcie1_rc: pcie@2910000 { ...@@ -666,7 +634,7 @@ pcie1_rc: pcie@2910000 {
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>;
device_type = "pci"; device_type = "pci";
ti,syscon-pcie-ctrl = <&pcie1_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x4074>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>;
...@@ -693,7 +661,7 @@ pcie1_ep: pcie-ep@2910000 { ...@@ -693,7 +661,7 @@ pcie1_ep: pcie-ep@2910000 {
reg-names = "intd_cfg", "user_cfg", "reg", "mem"; reg-names = "intd_cfg", "user_cfg", "reg", "mem";
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 330 IRQ_TYPE_EDGE_RISING>;
ti,syscon-pcie-ctrl = <&pcie1_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x4074>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>;
...@@ -714,7 +682,7 @@ pcie2_rc: pcie@2920000 { ...@@ -714,7 +682,7 @@ pcie2_rc: pcie@2920000 {
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 342 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 342 IRQ_TYPE_EDGE_RISING>;
device_type = "pci"; device_type = "pci";
ti,syscon-pcie-ctrl = <&pcie2_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x4078>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 241 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 241 TI_SCI_PD_EXCLUSIVE>;
...@@ -741,7 +709,7 @@ pcie2_ep: pcie-ep@2920000 { ...@@ -741,7 +709,7 @@ pcie2_ep: pcie-ep@2920000 {
reg-names = "intd_cfg", "user_cfg", "reg", "mem"; reg-names = "intd_cfg", "user_cfg", "reg", "mem";
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 342 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 342 IRQ_TYPE_EDGE_RISING>;
ti,syscon-pcie-ctrl = <&pcie2_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x4078>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 241 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 241 TI_SCI_PD_EXCLUSIVE>;
...@@ -762,7 +730,7 @@ pcie3_rc: pcie@2930000 { ...@@ -762,7 +730,7 @@ pcie3_rc: pcie@2930000 {
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 354 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 354 IRQ_TYPE_EDGE_RISING>;
device_type = "pci"; device_type = "pci";
ti,syscon-pcie-ctrl = <&pcie3_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x407c>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 242 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 242 TI_SCI_PD_EXCLUSIVE>;
...@@ -789,7 +757,7 @@ pcie3_ep: pcie-ep@2930000 { ...@@ -789,7 +757,7 @@ pcie3_ep: pcie-ep@2930000 {
reg-names = "intd_cfg", "user_cfg", "reg", "mem"; reg-names = "intd_cfg", "user_cfg", "reg", "mem";
interrupt-names = "link_state"; interrupt-names = "link_state";
interrupts = <GIC_SPI 354 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 354 IRQ_TYPE_EDGE_RISING>;
ti,syscon-pcie-ctrl = <&pcie3_ctrl>; ti,syscon-pcie-ctrl = <&scm_conf 0x407c>;
max-link-speed = <3>; max-link-speed = <3>;
num-lanes = <2>; num-lanes = <2>;
power-domains = <&k3_pds 242 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 242 TI_SCI_PD_EXCLUSIVE>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment