Skip to content

Commit 44762a0

Browse files
arndbarndb
committed
Merge tag 'arm-soc/for-6.6/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based Device Tree changes for 6.6, please pull the following: - Arinc adds support for the Asus RT-AC3100 router based upon the BCM47094 SoC - Krzysztof splits interrupt properties per cell such that they are mode readable and adds missing spaces in front of node names/labels - Rafal updates the BCM5301X DTS to correct PCIe, SPI over GPIO properties. He describes the Ethernet links to internal switch ports and then updates the BCM53573 binding and Ethernet properties by declaring the BCM53125 external switch on port 5, add Ethernet links and disables the second Ethernet MAC on Luxul devices. - Dan describes the Wi-Fi regulatory mappings for Luxul devices - Stanislav updates the bcm28155 DTS to use node labels - Linus adds SEAMA compatible properties to MTD partitions - Aleksey updates the Linksys EA6500 v2 to have the full 256MiB of DRAM available - Stefan updates a number of BCM283x nodes to confirm to DTS schema: pinctrl, DMA controllers and PWM cells. * tag 'arm-soc/for-6.6/devicetree' of https://github.com/Broadcom/stblinux: (23 commits) ARM: dts: BCM5301X: Add DT for ASUS RT-AC3100 dt-bindings: arm: bcm: add bindings for ASUS RT-AC3100 ARM: dts: broadcom: split interrupts per cells ARM: dts: BCM53573: Disable second Ethernet on Luxul devices ARM: dts: BCM53573: Add Ethernet interfaces links ARM: dts: BCM53573: Add BCM53125 switch port 5 ARM: dts: BCM53573: Describe BCM53125 switch ports in the main DTS ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port ARM: dts: bcm28155-ap: use node labels ARM: dts: bcm5301x: Add SEAMA compatibles ARM: dts: BCM53573: Fix Ethernet info for Luxul devices ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 dt-bindings: arm: bcm: add BCM53573 SoCs family binding ARM: dts: BCM53573: Use updated "spi-gpio" binding properties ARM: dts: BCM53573: Add cells sizes to PCIe node ARM: dts: BCM53573: Drop nonexistent #usb-cells ARM: dts: BCM53573: Drop nonexistent "default-off" LED trigger ARM: dts: BCM5301X: Add Ethernet interfaces links ARM: dts: BCM5301X: Add Wi-Fi regulatory mappings for Luxul devices ARM: dts: broadcom: add missing space before { ... Link: https://lore.kernel.org/r/20230818164539.2871539-1-florian.fainelli@broadcom.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents c708140 + 2900083 commit 44762a0

40 files changed

+501
-246
lines changed

‎Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ properties:
6666
- description: BCM47094 based boards
6767
items:
6868
- enum:
69+
- asus,rt-ac3100
6970
- asus,rt-ac88u
7071
- dlink,dir-885l
7172
- dlink,dir-890l

‎Documentation/devicetree/bindings/arm/bcm/brcm,bcm53573.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm53573.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM53573 SoCs family
8+
9+
description:
10+
Broadcom BCM53573 / BCM47189 Wi-Fi SoCs derived from Northstar.
11+
12+
maintainers:
13+
- Rafał Miłecki <rafal@milecki.pl>
14+
15+
properties:
16+
$nodename:
17+
const: '/'
18+
compatible:
19+
oneOf:
20+
- description: BCM53573 based boards
21+
items:
22+
- enum:
23+
- tenda,ac6-v1
24+
- tenda,w15e-v1
25+
- const: brcm,bcm53573
26+
27+
- description: BCM47189 based boards
28+
items:
29+
- enum:
30+
- brcm,bcm947189acdbmr
31+
- luxul,xap-810-v1
32+
- luxul,xap-1440-v1
33+
- tenda,ac9
34+
- const: brcm,bcm47189
35+
- const: brcm,bcm53573
36+
37+
additionalProperties: true
38+
39+
...

‎arch/arm/boot/dts/broadcom/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
7070
bcm4709-netgear-r7000.dtb \
7171
bcm4709-netgear-r8000.dtb \
7272
bcm4709-tplink-archer-c9-v1.dtb \
73+
bcm47094-asus-rt-ac3100.dtb \
7374
bcm47094-asus-rt-ac88u.dtb \
7475
bcm47094-dlink-dir-885l.dtb \
7576
bcm47094-dlink-dir-890l.dtb \

‎arch/arm/boot/dts/broadcom/bcm-hr2.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454

5555
pmu {
5656
compatible = "arm,cortex-a9-pmu";
57-
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH
58-
GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
57+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
58+
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
5959
interrupt-affinity = <&cpu0>;
6060
};
6161

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,32 @@
272272

273273
gmac0: ethernet@24000 {
274274
reg = <0x24000 0x800>;
275+
phy-mode = "internal";
276+
277+
fixed-link {
278+
speed = <1000>;
279+
full-duplex;
280+
};
275281
};
276282

277283
gmac1: ethernet@25000 {
278284
reg = <0x25000 0x800>;
285+
phy-mode = "internal";
286+
287+
fixed-link {
288+
speed = <1000>;
289+
full-duplex;
290+
};
279291
};
280292

281293
gmac2: ethernet@26000 {
282294
reg = <0x26000 0x800>;
295+
phy-mode = "internal";
296+
297+
fixed-link {
298+
speed = <1000>;
299+
full-duplex;
300+
};
283301
};
284302

285303
gmac3: ethernet@27000 {

‎arch/arm/boot/dts/broadcom/bcm-nsp.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272

7373
pmu {
7474
compatible = "arm,cortex-a9-pmu";
75-
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH
76-
GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
75+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
76+
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
7777
interrupt-affinity = <&cpu0>, <&cpu1>;
7878
};
7979

‎arch/arm/boot/dts/broadcom/bcm11351.dtsi

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,12 @@
111111
gpio: gpio@35003000 {
112112
compatible = "brcm,bcm11351-gpio", "brcm,kona-gpio";
113113
reg = <0x35003000 0x800>;
114-
interrupts =
115-
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH
116-
GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH
117-
GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH
118-
GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
119-
GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
120-
GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
114+
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
115+
<GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
116+
<GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
117+
<GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
118+
<GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
119+
<GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
121120
#gpio-cells = <2>;
122121
#interrupt-cells = <2>;
123122
gpio-controller;

‎arch/arm/boot/dts/broadcom/bcm21664.dtsi

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@
101101
gpio: gpio@35003000 {
102102
compatible = "brcm,bcm21664-gpio", "brcm,kona-gpio";
103103
reg = <0x35003000 0x524>;
104-
interrupts =
105-
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH
106-
GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH
107-
GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH
108-
GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
104+
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
105+
<GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
106+
<GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
107+
<GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
109108
#gpio-cells = <2>;
110109
#interrupt-cells = <2>;
111110
gpio-controller;

‎arch/arm/boot/dts/broadcom/bcm23550.dtsi

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,10 @@
101101
gpio: gpio@1003000 {
102102
compatible = "brcm,bcm23550-gpio", "brcm,kona-gpio";
103103
reg = <0x01003000 0x524>;
104-
interrupts =
105-
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH
106-
GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH
107-
GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH
108-
GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
104+
interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
105+
<GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,
106+
<GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
107+
<GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
109108
#gpio-cells = <2>;
110109
#interrupt-cells = <2>;
111110
gpio-controller;

‎arch/arm/boot/dts/broadcom/bcm2711.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
};
7777
};
7878

79-
dma: dma@7e007000 {
79+
dma: dma-controller@7e007000 {
8080
compatible = "brcm,bcm2835-dma";
8181
reg = <0x7e007000 0xb00>;
8282
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
@@ -278,7 +278,7 @@
278278
clocks = <&clocks BCM2835_CLOCK_PWM>;
279279
assigned-clocks = <&clocks BCM2835_CLOCK_PWM>;
280280
assigned-clock-rates = <10000000>;
281-
#pwm-cells = <2>;
281+
#pwm-cells = <3>;
282282
status = "disabled";
283283
};
284284

0 commit comments

Comments
 (0)