Skip to content

Commit a0189fd

Browse files
jannaumarcan
authored andcommitted
arm64: dts: apple: t8103: Disable unused PCIe ports
The PCIe ports are unused (without devices) so disable them instead of removing them. Fixes: 7c77ab9 ("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>
1 parent 2d5ce3f commit a0189fd

6 files changed

Lines changed: 27 additions & 38 deletions

File tree

arch/arm64/boot/dts/apple/t8103-j274.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,27 @@
3737

3838
&port01 {
3939
bus-range = <2 2>;
40+
status = "okay";
4041
};
4142

4243
&port02 {
4344
bus-range = <3 3>;
45+
status = "okay";
4446
ethernet0: ethernet@0,0 {
4547
reg = <0x30000 0x0 0x0 0x0 0x0>;
4648
/* To be filled by the loader */
4749
local-mac-address = [00 10 18 00 00 00];
4850
};
4951
};
5052

53+
&pcie0_dart_1 {
54+
status = "okay";
55+
};
56+
57+
&pcie0_dart_2 {
58+
status = "okay";
59+
};
60+
5161
&i2c2 {
5262
status = "okay";
5363
};

arch/arm64/boot/dts/apple/t8103-j293.dts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@
2525
brcm,board-type = "apple,honshu";
2626
};
2727

28-
/*
29-
* Remove unused PCIe ports and disable the associated DARTs.
30-
*/
31-
32-
&pcie0_dart_1 {
33-
status = "disabled";
34-
};
35-
36-
&pcie0_dart_2 {
37-
status = "disabled";
38-
};
39-
40-
/delete-node/ &port01;
41-
/delete-node/ &port02;
42-
4328
&i2c2 {
4429
status = "okay";
4530
};

arch/arm64/boot/dts/apple/t8103-j313.dts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,3 @@
2424
&wifi0 {
2525
brcm,board-type = "apple,shikoku";
2626
};
27-
28-
/*
29-
* Remove unused PCIe ports and disable the associated DARTs.
30-
*/
31-
32-
&pcie0_dart_1 {
33-
status = "disabled";
34-
};
35-
36-
&pcie0_dart_2 {
37-
status = "disabled";
38-
};
39-
40-
/delete-node/ &port01;
41-
/delete-node/ &port02;

arch/arm64/boot/dts/apple/t8103-j456.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,23 @@
5555

5656
&port01 {
5757
bus-range = <2 2>;
58+
status = "okay";
5859
};
5960

6061
&port02 {
6162
bus-range = <3 3>;
63+
status = "okay";
6264
ethernet0: ethernet@0,0 {
6365
reg = <0x30000 0x0 0x0 0x0 0x0>;
6466
/* To be filled by the loader */
6567
local-mac-address = [00 10 18 00 00 00];
6668
};
6769
};
70+
71+
&pcie0_dart_1 {
72+
status = "okay";
73+
};
74+
75+
&pcie0_dart_2 {
76+
status = "okay";
77+
};

arch/arm64/boot/dts/apple/t8103-j457.dts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,14 @@
3737

3838
&port02 {
3939
bus-range = <3 3>;
40+
status = "okay";
4041
ethernet0: ethernet@0,0 {
4142
reg = <0x30000 0x0 0x0 0x0 0x0>;
4243
/* To be filled by the loader */
4344
local-mac-address = [00 10 18 00 00 00];
4445
};
4546
};
4647

47-
/*
48-
* Remove unused PCIe port and disable the associated DART.
49-
*/
50-
51-
&pcie0_dart_1 {
52-
status = "disabled";
48+
&pcie0_dart_2 {
49+
status = "okay";
5350
};
54-
55-
/delete-node/ &port01;

arch/arm64/boot/dts/apple/t8103.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,7 @@
724724
interrupt-parent = <&aic>;
725725
interrupts = <AIC_IRQ 699 IRQ_TYPE_LEVEL_HIGH>;
726726
power-domains = <&ps_apcie_gp>;
727+
status = "disabled";
727728
};
728729

729730
pcie0_dart_2: iommu@683008000 {
@@ -733,6 +734,7 @@
733734
interrupt-parent = <&aic>;
734735
interrupts = <AIC_IRQ 702 IRQ_TYPE_LEVEL_HIGH>;
735736
power-domains = <&ps_apcie_gp>;
737+
status = "disabled";
736738
};
737739

738740
pcie0: pcie@690000000 {
@@ -807,6 +809,7 @@
807809
<0 0 0 2 &port01 0 0 0 1>,
808810
<0 0 0 3 &port01 0 0 0 2>,
809811
<0 0 0 4 &port01 0 0 0 3>;
812+
status = "disabled";
810813
};
811814

812815
port02: pci@2,0 {
@@ -826,6 +829,7 @@
826829
<0 0 0 2 &port02 0 0 0 1>,
827830
<0 0 0 3 &port02 0 0 0 2>,
828831
<0 0 0 4 &port02 0 0 0 3>;
832+
status = "disabled";
829833
};
830834
};
831835
};

0 commit comments

Comments
 (0)