| Message ID | 20220725055402.6013-2-william.zhang@broadcom.com |
|---|---|
| State | Accepted |
| Commit | 9bf2eb19c90193a38a3d1095ee90e38325cdbe4d |
| Headers | show |
| Series | [v2,1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA | expand |
On Sun, 24 Jul 2022 22:53:54 -0700, William Zhang wrote: > BCM4908 is one of the Broadcom Broadband origin WLAN Router/Access > Pointer SoCs. It was originally added by Rafał before Broadcom > started to upstream the support for broadband SoCs. Now that Broadcom > Broadband SoC is supported under arch ARCH_BCMBCA, this patch moves > BCM4908 SoC device tree descriptions into BCMBCA binding. > > Signed-off-by: William Zhang <william.zhang@broadcom.com> > Acked-by: Rafał Miłecki <rafal@milecki.pl> > > --- > > Changes in v2: > - Add Acked-by tag > - Improve commit message with more details > > .../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 > Reviewed-by: Rob Herring <robh@kernel.org>
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: