arm64: dts: ti: k3-j721e: Enable PCIe nodes at the board level

PCIe nodes defined in the top-level J721e SoC dtsi files are incomplete
and will not be functional unless they are extended with a SerDes PHY.
And usually only one of the two modes can be used at a time as they
share a SerDes link.

As the PHY and mode is only known at the board integration level, these
nodes should only be enabled when provided with this information.

Disable the PCIe nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230515172137.474626-3-afd@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
index d77eeff0d81d49c8d934ae3f0605686b4d9ff9fc..be0c5431119ee0a957f711cca42781da5aeb1201 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts
@@ -872,12 +872,8 @@
        };
 };
 
-&pcie0_rc {
-       /* Unused */
-       status = "disabled";
-};
-
 &pcie1_rc {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pcie1_rst_pins_default>;
        phys = <&serdes1_pcie_link>;
@@ -887,16 +883,6 @@
        reset-gpios = <&main_gpio0 22 GPIO_ACTIVE_HIGH>;
 };
 
-&pcie2_rc {
-       /* Unused */
-       status = "disabled";
-};
-
-&pcie3_rc {
-       /* Unused */
-       status = "disabled";
-};
-
 &icssg0_mdio {
        /* Unused */
        status = "disabled";

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
index 7957d09bf04b5a42b23278e68e53def021dacf51..42579564c3bde86986d7d672d32036d5be9cf28a 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
@@ -819,6 +819,7 @@
 };
 
 &pcie0_rc {
+       status = "okay";
        reset-gpios = <&exp1 6 GPIO_ACTIVE_HIGH>;
        phys = <&serdes0_pcie_link>;
        phy-names = "pcie-phy";
@@ -826,6 +827,7 @@
 };
 
 &pcie1_rc {
+       status = "okay";
        reset-gpios = <&exp1 2 GPIO_ACTIVE_HIGH>;
        phys = <&serdes1_pcie_link>;
        phy-names = "pcie-phy";
@@ -833,16 +835,13 @@
 };
 
 &pcie2_rc {
+       status = "okay";
        reset-gpios = <&exp2 20 GPIO_ACTIVE_HIGH>;
        phys = <&serdes2_pcie_link>;
        phy-names = "pcie-phy";
        num-lanes = <2>;
 };
 
-&pcie3_rc {
-       status = "disabled";
-};
-
 &icssg0_mdio {
        status = "disabled";
 };

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
index 5ca0ddd82bfc6742511be7807ca957e90f2e26f1..af5bc2d284ca8786eebbf788bcefbfd42b0cc539 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
@@ -814,6 +814,7 @@
                ranges = <0x01000000 0x0 0x10001000 0x0 0x10001000 0x0 0x0010000>,
                         <0x02000000 0x0 0x10011000 0x0 0x10011000 0x0 0x7fef000>;
                dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
+               status = "disabled";
        };
 
        pcie1_rc: pcie@2910000 {
@@ -842,6 +843,7 @@
                ranges = <0x01000000 0x0 0x18001000 0x0 0x18001000 0x0 0x0010000>,
                         <0x02000000 0x0 0x18011000 0x0 0x18011000 0x0 0x7fef000>;
                dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
+               status = "disabled";
        };
 
        pcie2_rc: pcie@2920000 {
@@ -870,6 +872,7 @@
                ranges = <0x01000000 0x0 0x00001000 0x44 0x00001000 0x0 0x0010000>,
                         <0x02000000 0x0 0x00011000 0x44 0x00011000 0x0 0x7fef000>;
                dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
+               status = "disabled";
        };
 
        pcie3_rc: pcie@2930000 {
@@ -898,6 +901,7 @@
                ranges = <0x01000000 0x0 0x00001000 0x44 0x10001000 0x0 0x0010000>,
                         <0x02000000 0x0 0x00011000 0x44 0x10011000 0x0 0x7fef000>;
                dma-ranges = <0x02000000 0x0 0x0 0x0 0x0 0x10000 0x0>;
+               status = "disabled";
        };
 
        serdes_wiz4: wiz@5050000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
index 3fb24b68fe8e5922614b2dc53b432607df15a341..50364c05415e4afe909cdb80b1e513bb3422bc17 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts
@@ -871,6 +871,7 @@
 };
 
 &pcie0_rc {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&ekey_reset_pins_default>;
        reset-gpios = <&main_gpio0 72 GPIO_ACTIVE_HIGH>;
@@ -881,6 +882,7 @@
 };
 
 &pcie1_rc {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mkey_reset_pins_default>;
        reset-gpios = <&wkup_gpio0 11 GPIO_ACTIVE_HIGH>;
@@ -890,16 +892,6 @@
        num-lanes = <2>;
 };
 
-&pcie2_rc {
-       /* Unused */
-       status = "disabled";
-};
-
-&pcie3_rc {
-       /* Unused */
-       status = "disabled";
-};
-
 &icssg0_mdio {
        status = "disabled";
 };