diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 17:58:32 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 17:58:32 +0100 |
| commit | 528587ea03b1db948bd3a1b0ecdf42a0b92f0fe7 (patch) | |
| tree | 7cdf67fa35c91fc819e335ad875f42821af6c499 /Documentation/devicetree/bindings/arm | |
| parent | af6e05f171145298d6a6aba29c88c595258d2829 (diff) | |
| parent | fe119977677e7dd3ddb4ab52678b46b804148eb5 (diff) | |
Merge tag 'arm-soc/for-5.12/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contains Broadcom ARM64-based SoCs Device Tree changes
for 5.12 please pull the following:
- Rafal continues to add support for the 4906/4908 SoC family and adds
a Device Tree for the Netgear R8000P router (4906-based), describes
the NAND controller of the 4908 more appropriately (based on the older
63138 DSL SoC), describes the 4908 PCIe reset controller, internal
Ethernet switch (Starfighter 2 switch) and finally the Power
Management Bus (PMB)
- Scott removes all of the SATA-related Device Tree nodes since SATA
is unused on the Stingray product line
* tag 'arm-soc/for-5.12/devicetree-arm64' of https://github.com/Broadcom/stblinux:
arm64: dts: broadcom: Remove SATA from Stingray
arm64: dts: broadcom: bcm4908: describe PMB block
arm64: dts: broadcom: bcm4908: describe internal switch
arm64: dts: broadcom: bcm4908: describe PCIe reset controller
arm64: dts: broadcom: bcm4908: use proper NAND binding
arm64: dts: broadcom: bcm4908: add BCM4906 Netgear R8000P DTS files
dt-bindings: arm: bcm: document Netgear R8000P binding
Link: https://lore.kernel.org/r/20210131221721.685974-4-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml index 5fec063d9a13..e55731f43c84 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml @@ -19,6 +19,8 @@ properties: oneOf: - description: BCM4906 based boards items: + - enum: + - netgear,r8000p - const: brcm,bcm4906 - const: brcm,bcm4908 |