diff options
| author | William Zhang <[email protected]> | 2022-08-03 10:54:47 -0700 |
|---|---|---|
| committer | Florian Fainelli <[email protected]> | 2022-08-15 09:48:06 -0700 |
| commit | 9bf2eb19c90193a38a3d1095ee90e38325cdbe4d (patch) | |
| tree | 5f4e995a9409d4bc324862c890175c15ab7fe585 | |
| parent | 61dc1e3850a6b88903f6f3912db35575ab78ab50 (diff) | |
dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
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 <[email protected]>
Acked-by: Rafał Miłecki <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Florian Fainelli <[email protected]>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml | 42 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 21 |
2 files changed, 21 insertions, 42 deletions
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 <[email protected]> - -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 <[email protected]> - Anand Gore <[email protected]> - Kursad Oney <[email protected]> + - Rafał Miłecki <[email protected]> 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: |