Skip to content

Commit a26dffc

Browse files
committed
Merge tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based SoCs changes for 6.7, please pull the following: - Rafal makes a number of updates to the BCM5301X (Northstar) SoCs DTS to set MAC addresses for D-LInk DIR-885L, Asus, RT-AC87U, he relicenses parts of the DTSI to GPL 2.0+ / MIT, and finally fixes a number of Ethernet switch ports properties to enable/disable ports adequately. * tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom/stblinux: ARM: dts: BCM5301X: Set switch ports for Linksys EA9200 ARM: dts: BCM5301X: Set fixed-link for extra Netgear R8000 CPU ports ARM: dts: BCM5301X: Explicitly disable unused switch CPU ports ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT ARM: dts: BCM5301X: Set MAC address for Asus RT-AC87U ARM: dts: BCM5301X: Set MACs for D-Link DIR-885L Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e209b02 + 253358f commit a26dffc

24 files changed

+269
-34
lines changed

arch/arm/boot/dts/broadcom/bcm-ns.dtsi

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
#address-cells = <1>;
1515
#size-cells = <1>;
1616

17+
pmu {
18+
compatible = "arm,cortex-a9-pmu";
19+
interrupts =
20+
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
21+
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
22+
};
23+
1724
chipcommon-a-bus@18000000 {
1825
compatible = "simple-bus";
1926
ranges = <0x00000000 0x18000000 0x00001000>;
@@ -320,6 +327,29 @@
320327
#address-cells = <1>;
321328
};
322329

330+
mdio-mux@18003000 {
331+
compatible = "mdio-mux-mmioreg", "mdio-mux";
332+
mdio-parent-bus = <&mdio>;
333+
#address-cells = <1>;
334+
#size-cells = <0>;
335+
reg = <0x18003000 0x4>;
336+
mux-mask = <0x200>;
337+
338+
mdio@0 {
339+
reg = <0x0>;
340+
#address-cells = <1>;
341+
#size-cells = <0>;
342+
343+
usb3_phy: usb3-phy@10 {
344+
compatible = "brcm,ns-ax-usb3-phy";
345+
reg = <0x10>;
346+
usb3-dmp-syscon = <&usb3_dmp>;
347+
#phy-cells = <0>;
348+
status = "disabled";
349+
};
350+
};
351+
};
352+
323353
rng: rng@18004000 {
324354
compatible = "brcm,bcm5301x-rng";
325355
reg = <0x18004000 0x14>;
@@ -460,6 +490,10 @@
460490
brcm,nand-has-wp;
461491
};
462492

493+
usb3_dmp: syscon@18105000 {
494+
reg = <0x18105000 0x1000>;
495+
};
496+
463497
thermal-zones {
464498
cpu_thermal: cpu-thermal {
465499
polling-delay-passive = <0>;

arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,13 @@
181181
port@5 {
182182
label = "cpu";
183183
};
184+
185+
port@7 {
186+
status = "disabled";
187+
};
188+
189+
port@8 {
190+
status = "disabled";
191+
};
184192
};
185193
};

arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,13 @@
8585
port@5 {
8686
label = "cpu";
8787
};
88+
89+
port@7 {
90+
status = "disabled";
91+
};
92+
93+
port@8 {
94+
status = "disabled";
95+
};
8896
};
8997
};

arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,13 @@
8888
port@5 {
8989
label = "cpu";
9090
};
91+
92+
port@7 {
93+
status = "disabled";
94+
};
95+
96+
port@8 {
97+
status = "disabled";
98+
};
9199
};
92100
};

arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,13 @@
122122
port@5 {
123123
label = "cpu";
124124
};
125+
126+
port@7 {
127+
status = "disabled";
128+
};
129+
130+
port@8 {
131+
status = "disabled";
132+
};
125133
};
126134
};

arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,14 @@
145145
port@5 {
146146
label = "cpu";
147147
};
148+
149+
port@7 {
150+
status = "disabled";
151+
};
152+
153+
port@8 {
154+
status = "disabled";
155+
};
148156
};
149157
};
150158

arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,13 @@
145145
port@5 {
146146
label = "cpu";
147147
};
148+
149+
port@7 {
150+
status = "disabled";
151+
};
152+
153+
port@8 {
154+
status = "disabled";
155+
};
148156
};
149157
};

arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,13 @@
8181
port@5 {
8282
label = "cpu";
8383
};
84+
85+
port@7 {
86+
status = "disabled";
87+
};
88+
89+
port@8 {
90+
status = "disabled";
91+
};
8492
};
8593
};

arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,13 @@
148148
port@5 {
149149
label = "cpu";
150150
};
151+
152+
port@7 {
153+
status = "disabled";
154+
};
155+
156+
port@8 {
157+
status = "disabled";
158+
};
151159
};
152160
};

arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
<0x88000000 0x08000000>;
2626
};
2727

28+
nvram@1c080000 {
29+
et1macaddr: et1macaddr {
30+
#nvmem-cell-cells = <1>;
31+
};
32+
};
33+
2834
leds {
2935
compatible = "gpio-leds";
3036

@@ -62,6 +68,11 @@
6268
};
6369
};
6470

71+
&gmac0 {
72+
nvmem-cells = <&et1macaddr 0>;
73+
nvmem-cell-names = "mac-address";
74+
};
75+
6576
&usb3_phy {
6677
status = "okay";
6778
};

0 commit comments

Comments
 (0)