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

[ Upstream commit a0189fdfb73dac856b8fa9b9f9581e5099c9391f ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts
index c1f3ba9..997ef90 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j274.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j274.dts
@@ -33,10 +33,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 */
@@ -44,6 +46,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 ecb10d2..3fd444a 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j293.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j293.dts
@@ -21,21 +21,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 df74173..9399c42 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j313.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j313.dts
@@ -20,18 +20,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 8c6bf95..d80223f 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j456.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j456.dts
@@ -51,13 +51,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 fe7c0aa..e24ccb4 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103-j457.dts
+++ b/arch/arm64/boot/dts/apple/t8103-j457.dts
@@ -33,6 +33,7 @@
 
 &port02 {
        bus-range = <3 3>;
+       status = "okay";
        ethernet0: ethernet@0,0 {
                reg = <0x30000 0x0 0x0 0x0 0x0>;
                /* To be filled by the loader */
@@ -40,12 +41,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 a4d195e..84fd1b1 100644 (file)
--- a/arch/arm64/boot/dts/apple/t8103.dtsi
+++ b/arch/arm64/boot/dts/apple/t8103.dtsi
@@ -428,6 +428,7 @@
                        interrupt-parent = <&aic>;
                        interrupts = <AIC_IRQ 699 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&ps_apcie_gp>;
+                       status = "disabled";
                };
 
                pcie0_dart_2: iommu@683008000 {
@@ -437,6 +438,7 @@
                        interrupt-parent = <&aic>;
                        interrupts = <AIC_IRQ 702 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&ps_apcie_gp>;
+                       status = "disabled";
                };
 
                pcie0: pcie@690000000 {
@@ -511,6 +513,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 {
@@ -530,6 +533,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";
                        };
                };
        };