[PATCH 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
From: William Zhang <william.zhang@broadcom.com>
Date: 2022-07-20 23:52:28
Also in:
linux-devicetree, lkml
Subsystem:
broadcom bcmbca arm architecture, open firmware and flattened device tree bindings, the rest · Maintainers:
William Zhang, Anand Gore, Kursad Oney, Florian Fainelli, Rafał Miłecki, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds
Copy BCM4908 SoC device tree descriptions into BCMBCA binding and delete the BCM4908 binding document. Signed-off-by: William Zhang <william.zhang@broadcom.com> --- .../bindings/arm/bcm/brcm,bcm4908.yaml | 42 ------------------- .../bindings/arm/bcm/brcm,bcmbca.yaml | 21 ++++++++++ 2 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
deleted file mode 100644
index 9b745531ff04..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
+++ /dev/null@@ -1,42 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4908.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Broadcom BCM4908 device tree bindings - -description: - Broadcom BCM4906 / BCM4908 / BCM49408 Wi-Fi/network SoCs with Brahma CPUs. - -maintainers: - - Rafał Miłecki <rafal@milecki.pl> - -properties: - $nodename: - const: '/' - compatible: - oneOf: - - description: BCM4906 based boards - items: - - enum: - - netgear,r8000p - - tplink,archer-c2300-v1 - - const: brcm,bcm4906 - - const: brcm,bcm4908 - - - description: BCM4908 based boards - items: - - enum: - - asus,gt-ac5300 - - netgear,raxe500 - - const: brcm,bcm4908 - - - description: BCM49408 based boards - items: - - const: brcm,bcm49408 - - const: brcm,bcm4908 - -additionalProperties: true - -...
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
index 324e59104360..6a64afa95918 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml@@ -15,6 +15,7 @@ maintainers: - William Zhang <william.zhang@broadcom.com> - Anand Gore <anand.gore@broadcom.com> - Kursad Oney <kursad.oney@broadcom.com> + - Rafał Miłecki <rafal@milecki.pl> properties: $nodename:
@@ -28,6 +29,26 @@ properties: - const: brcm,bcm47622 - const: brcm,bcmbca + - description: BCM4906 based boards + items: + - enum: + - netgear,r8000p + - tplink,archer-c2300-v1 + - const: brcm,bcm4906 + - const: brcm,bcm4908 + + - description: BCM4908 based boards + items: + - enum: + - asus,gt-ac5300 + - netgear,raxe500 + - const: brcm,bcm4908 + + - description: BCM49408 based boards + items: + - const: brcm,bcm49408 + - const: brcm,bcm4908 + - description: BCM4912 based boards items: - enum:
--
2.34.1