Skip to content

Commit 313c22b

Browse files
committed
Merge tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based SoCs Device Tree changes for 6.5, please pull the following: - Krzysztof adds missing cache properties for the BCM63xx DSL routers - Rafal relicenses a number of the BCM5301X DTS files to the GPL 2.0+ / MIT license, and he fixes a number of Device Tree nodes warnings, adds MAC address for all Luxul routers and adds Netgear R8000 Wi-Fi regulatory information to the DTS - Stanislav updates the "BCM mobile" SoCs DTS files to fix various warnings - Aurelien enables the BCM283x DTS files to be built with relocation information to make them usable with DT overlays - Christian fixes the Meraki DTS to have correct NAND ECC properties, correct partition numbers and fixed-link node(s) properties * tag 'arm-soc/for-6.5/devicetree' of https://github.com/Broadcom/stblinux: (33 commits) ARM: dts: BCM5301X: Add cells sizes to PCIe nodes dt-bindings: firmware: brcm,kona-smc: convert to YAML ARM: dts: BCM5301X: Add Netgear R8000 WiFi regulator mappings dt-bindings: net: wireless: brcm,bcm4329-fmac: allow generic properties dt-bindings: net: wireless: brcm,bcm4329-fmac: add BCM4366 binding ARM: dts: BCM5301X: fix duplex-full => full-duplex ARM: dts: BCM5301X: MR32: remove partition index numbers ARM: dts: BCM5301X: MR26: MR32: remove bogus nand-ecc-algo property dt-bindings: power: reset: bcm21664-resetmgr: convert to YAML ARM: dts: bcm21664-garnet: use node labels ARM: dts: bcm11351/21664: add UART, I2C node labels ARM: dts: bcm-mobile: move status properties to the end of nodes ARM: dts: bcm21664/23550: use CCU compatibles directly ARM: dts: bcm-mobile: change "" includes to <> where applicable ARM: dts: BCM5301X: Describe switch ports in the main DTS ARM: dts: BCM5301X: Relicense Christian's code to the GPL 2.0+ / MIT ARM: dts: BCM5301X: Drop invalid properties from Meraki MR32 keys ARM: dts: BCM5301X: Drop invalid #usb-cells dt-bindings: arm: bcm: Add bindings for Buffalo WZR-1166DHP(2) ARM: dts: BCM5301X: Use updated "spi-gpio" binding properties ... Link: https://lore.kernel.org/r/20230619134920.3384844-1-florian.fainelli@broadcom.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 11d5441 + b67cad3 commit 313c22b

47 files changed

Lines changed: 853 additions & 723 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ properties:
2525
- enum:
2626
- asus,rt-ac56u
2727
- asus,rt-ac68u
28+
- buffalo,wzr-1166dhp
29+
- buffalo,wzr-1166dhp2
2830
- buffalo,wzr-1750dhp
2931
- linksys,ea6300-v1
3032
- linksys,ea6500-v2
31-
- luxul,xap-1510v1
33+
- luxul,xap-1510-v1
3234
- luxul,xwc-1000
33-
- netgear,r6250v1
34-
- netgear,r6300v2
35+
- netgear,r6250-v1
36+
- netgear,r6300-v2
3537
- smartrg,sr400ac
3638
- brcm,bcm94708
3739
- const: brcm,bcm4708
@@ -42,8 +44,8 @@ properties:
4244
- asus,rt-n18u
4345
- buffalo,wzr-600dhp2
4446
- buffalo,wzr-900dhp
45-
- luxul,xap-1410v1
46-
- luxul,xwr-1200v1
47+
- luxul,xap-1410-v1
48+
- luxul,xwr-1200-v1
4749
- tplink,archer-c5-v2
4850
- const: brcm,bcm47081
4951
- const: brcm,bcm4708
@@ -72,7 +74,7 @@ properties:
7274
- luxul,xap-1610-v1
7375
- luxul,xbr-4500-v1
7476
- luxul,xwc-2000-v1
75-
- luxul,xwr-3100v1
77+
- luxul,xwr-3100-v1
7678
- luxul,xwr-3150-v1
7779
- netgear,r8500
7880
- phicomm,k3
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/firmware/brcm,kona-smc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom Kona family Secure Monitor bounce buffer
8+
9+
description:
10+
A bounce buffer used for non-secure to secure communications.
11+
12+
maintainers:
13+
- Florian Fainelli <f.fainelli@gmail.com>
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- brcm,bcm11351-smc
20+
- brcm,bcm21664-smc
21+
- brcm,bcm23550-smc
22+
- const: brcm,kona-smc
23+
24+
reg:
25+
maxItems: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
smc@3404c000 {
36+
compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
37+
reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
38+
};
39+
...

Documentation/devicetree/bindings/misc/brcm,kona-smc.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ description:
1515
These chips also have a Bluetooth portion described in a separate
1616
binding.
1717

18+
allOf:
19+
- $ref: ieee80211.yaml#
20+
1821
properties:
1922
compatible:
2023
oneOf:
@@ -38,6 +41,7 @@ properties:
3841
- brcm,bcm4354-fmac
3942
- brcm,bcm4356-fmac
4043
- brcm,bcm4359-fmac
44+
- brcm,bcm4366-fmac
4145
- cypress,cyw4373-fmac
4246
- cypress,cyw43012-fmac
4347
- const: brcm,bcm4329-fmac
@@ -120,7 +124,7 @@ required:
120124
- compatible
121125
- reg
122126

123-
additionalProperties: false
127+
unevaluatedProperties: false
124128

125129
examples:
126130
- |

Documentation/devicetree/bindings/power/reset/brcm,bcm21664-resetmgr.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/power/reset/brcm,bcm21664-resetmgr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom Kona family reset manager
8+
9+
maintainers:
10+
- Florian Fainelli <f.fainelli@gmail.com>
11+
12+
properties:
13+
compatible:
14+
const: brcm,bcm21664-resetmgr
15+
16+
reg:
17+
maxItems: 1
18+
19+
required:
20+
- compatible
21+
- reg
22+
23+
additionalProperties: false
24+
25+
examples:
26+
- |
27+
reset-controller@35001f00 {
28+
compatible = "brcm,bcm21664-resetmgr";
29+
reg = <0x35001f00 0x24>;
30+
};
31+
...
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/soc/bcm/brcm,bcm23550-cdc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM23550 Cluster Dormant Control
8+
9+
description:
10+
The Cluster Dormant Control block keeps the CPU in idle state. A command
11+
needs to be sent to this block to bring the CPU into running state.
12+
13+
maintainers:
14+
- Florian Fainelli <f.fainelli@gmail.com>
15+
16+
properties:
17+
compatible:
18+
const: brcm,bcm23550-cdc
19+
20+
reg:
21+
maxItems: 1
22+
23+
required:
24+
- compatible
25+
- reg
26+
27+
additionalProperties: false
28+
29+
examples:
30+
- |
31+
cdc@3fe0e000 {
32+
compatible = "brcm,bcm23550-cdc";
33+
reg = <0x3fe0e000 0x78>;
34+
};
35+
...

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3961,6 +3961,7 @@ M: Rafał Miłecki <zajec5@gmail.com>
39613961
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
39623962
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
39633963
S: Maintained
3964+
F: arch/arm/boot/dts/bcm-ns.dtsi
39643965
F: arch/arm/boot/dts/bcm470*
39653966
F: arch/arm/boot/dts/bcm5301*
39663967
F: arch/arm/boot/dts/bcm953012*

arch/arm/boot/dts/Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,24 @@ dtb-$(CONFIG_SOC_SP7021) += \
9999
sunplus-sp7021-demo-v3.dtb
100100
dtb-$(CONFIG_ARCH_AXXIA) += \
101101
axm5516-amarillo.dtb
102+
# Enables support for device-tree overlays
103+
DTC_FLAGS_bcm2835-rpi-b := -@
104+
DTC_FLAGS_bcm2835-rpi-a := -@
105+
DTC_FLAGS_bcm2835-rpi-b-rev2 := -@
106+
DTC_FLAGS_bcm2835-rpi-b-plus := -@
107+
DTC_FLAGS_bcm2835-rpi-a-plus := -@
108+
DTC_FLAGS_bcm2835-rpi-cm1-io1 := -@
109+
DTC_FLAGS_bcm2836-rpi-2-b := -@
110+
DTC_FLAGS_bcm2837-rpi-3-a-plus := -@
111+
DTC_FLAGS_bcm2837-rpi-3-b := -@
112+
DTC_FLAGS_bcm2837-rpi-3-b-plus := -@
113+
DTC_FLAGS_bcm2837-rpi-cm3-io3 := -@
114+
DTC_FLAGS_bcm2837-rpi-zero-2-w := -@
115+
DTC_FLAGS_bcm2711-rpi-400 := -@
116+
DTC_FLAGS_bcm2711-rpi-4-b := -@
117+
DTC_FLAGS_bcm2711-rpi-cm4-io := -@
118+
DTC_FLAGS_bcm2835-rpi-zero := -@
119+
DTC_FLAGS_bcm2835-rpi-zero-w := -@
102120
dtb-$(CONFIG_ARCH_BCM2835) += \
103121
bcm2835-rpi-b.dtb \
104122
bcm2835-rpi-a.dtb \

0 commit comments

Comments
 (0)