arm64: dts: apple: t8103: Disable unused PCIe ports

The PCIe ports are unused (without devices) so disable them instead of
removing them.

Fixes: 7c77ab91b33d ("arm64: dts: apple: Add missing M1 (t8103) devices")
Signed-off-by: Janne Grunau <j@jannau.net>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Signed-off-by: Hector Martin <marcan@marcan.st>

diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts
index b52ddc4098939bf6ad727cf3ecc646d0303354a8..1c3e37f86d46d7b5d733717b47c4b57dc55e1201 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j274.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j274.dts
@@ -37,10 +37,12 @@
 
 &port01 {
        bus-range = <2 2>;
+       status = "okay";
 };
 
 &port02 {
        bus-range = <3 3>;
+       status = "okay";
        ethernet0: ethernet@0,0 {
                reg = <0x30000 0x0 0x0 0x0 0x0>;
                /* To be filled by the loader */
@@ -48,6 +50,14 @@
        };
 };
 
+&pcie0_dart_1 {
+       status = "okay";
+};
+
+&pcie0_dart_2 {
+       status = "okay";
+};
+
 &i2c2 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts
index 151074109a114c3d99ee82a9d210e2643df7998f..c363dfef807090dc4ebabd419ff89b7af178b916 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j293.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
@@ -25,21 +25,6 @@
        brcm,board-type = "apple,honshu";
 };
 
-/*
- * Remove unused PCIe ports and disable the associated DARTs.
- */
-
-&pcie0_dart_1 {
-       status = "disabled";
-};
-
-&pcie0_dart_2 {
-       status = "disabled";
-};
-
-/delete-node/ &port01;
-/delete-node/ &port02;
-
 &i2c2 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/apple/t8103-j313.dts b/arch/arm64/boot/dts/apple/t8103-j313.dts
index bc1f865aa7909e19c8d0447f3314260b7af0441e..08409be1cf3576d671438e4c5bd26d6ccee09d5c 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j313.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j313.dts
@@ -24,18 +24,3 @@
 &wifi0 {
        brcm,board-type = "apple,shikoku";
 };
-
-/*
- * Remove unused PCIe ports and disable the associated DARTs.
- */
-
-&pcie0_dart_1 {
-       status = "disabled";
-};
-
-&pcie0_dart_2 {
-       status = "disabled";
-};
-
-/delete-node/ &port01;
-/delete-node/ &port02;

diff --git a/arch/arm64/boot/dts/apple/t8103-j456.dts b/arch/arm64/boot/dts/apple/t8103-j456.dts
index 2db425ceb30f6952908a64bbba4240fcd340c476..58c8e43789b4861544e20c717124ede3327be010 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j456.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j456.dts
@@ -55,13 +55,23 @@
 
 &port01 {
        bus-range = <2 2>;
+       status = "okay";
 };
 
 &port02 {
        bus-range = <3 3>;
+       status = "okay";
        ethernet0: ethernet@0,0 {
                reg = <0x30000 0x0 0x0 0x0 0x0>;
                /* To be filled by the loader */
                local-mac-address = [00 10 18 00 00 00];
        };
 };
+
+&pcie0_dart_1 {
+       status = "okay";
+};
+
+&pcie0_dart_2 {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/apple/t8103-j457.dts b/arch/arm64/boot/dts/apple/t8103-j457.dts
index 3821ff146c56b8236891f6320cc77e10da5bfbce..152f95fd49a2118093396838fbd8b6bd1b518f81 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j457.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j457.dts
@@ -37,6 +37,7 @@
 
 &port02 {
        bus-range = <3 3>;
+       status = "okay";
        ethernet0: ethernet@0,0 {
                reg = <0x30000 0x0 0x0 0x0 0x0>;
                /* To be filled by the loader */
@@ -44,12 +45,6 @@
        };
 };
 
-/*
- * Remove unused PCIe port and disable the associated DART.
- */
-
-&pcie0_dart_1 {
-       status = "disabled";
+&pcie0_dart_2 {
+       status = "okay";
 };
-
-/delete-node/ &port01;

diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
index 9859219699f4522224059e8957b16e52848a470c..87a9c1ba6d0f4f700e9d944f185f6ad8afed6bc5 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -724,6 +724,7 @@
                        interrupt-parent = <&aic>;
                        interrupts = <AIC_IRQ 699 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&ps_apcie_gp>;
+                       status = "disabled";
                };
 
                pcie0_dart_2: iommu@683008000 {
@@ -733,6 +734,7 @@
                        interrupt-parent = <&aic>;
                        interrupts = <AIC_IRQ 702 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&ps_apcie_gp>;
+                       status = "disabled";
                };
 
                pcie0: pcie@690000000 {
@@ -807,6 +809,7 @@
                                                <0 0 0 2 &port01 0 0 0 1>,
                                                <0 0 0 3 &port01 0 0 0 2>,
                                                <0 0 0 4 &port01 0 0 0 3>;
+                               status = "disabled";
                        };
 
                        port02: pci@2,0 {
@@ -826,6 +829,7 @@
                                                <0 0 0 2 &port02 0 0 0 1>,
                                                <0 0 0 3 &port02 0 0 0 2>,
                                                <0 0 0 4 &port02 0 0 0 3>;
+                               status = "disabled";
                        };
                };
        };