Unverified Commit 313c22bb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 11d5441c b67cad33

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

+8 −6
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ properties: 
          - enum:

              - asus,rt-ac56u

              - asus,rt-ac68u

              - buffalo,wzr-1166dhp

              - buffalo,wzr-1166dhp2

              - buffalo,wzr-1750dhp

              - linksys,ea6300-v1

              - linksys,ea6500-v2

              - luxul,xap-1510v1

              - luxul,xap-1510-v1

              - luxul,xwc-1000

              - netgear,r6250v1

              - netgear,r6300v2

              - netgear,r6250-v1

              - netgear,r6300-v2

              - smartrg,sr400ac

              - brcm,bcm94708

          - const: brcm,bcm4708
@@ -42,8 +44,8 @@ properties: 
              - asus,rt-n18u

              - buffalo,wzr-600dhp2

              - buffalo,wzr-900dhp

              - luxul,xap-1410v1

              - luxul,xwr-1200v1

              - luxul,xap-1410-v1

              - luxul,xwr-1200-v1

              - tplink,archer-c5-v2

          - const: brcm,bcm47081

          - const: brcm,bcm4708
@@ -72,7 +74,7 @@ properties: 
              - luxul,xap-1610-v1

              - luxul,xbr-4500-v1

              - luxul,xwc-2000-v1

              - luxul,xwr-3100v1

              - luxul,xwr-3100-v1

              - luxul,xwr-3150-v1

              - netgear,r8500

              - phicomm,k3

Documentation/devicetree/bindings/firmware/brcm,kona-smc.yaml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/firmware/brcm,kona-smc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Broadcom Kona family Secure Monitor bounce buffer



description:

  A bounce buffer used for non-secure to secure communications.



maintainers:

  - Florian Fainelli <f.fainelli@gmail.com>



properties:

  compatible:

    items:

      - enum:

          - brcm,bcm11351-smc

          - brcm,bcm21664-smc

          - brcm,bcm23550-smc

      - const: brcm,kona-smc



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    smc@3404c000 {

        compatible = "brcm,bcm11351-smc", "brcm,kona-smc";

        reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */

    };

...

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

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
Broadcom Secure Monitor Bounce buffer

-----------------------------------------------------

This binding defines the location of the bounce buffer

used for non-secure to secure communications.



Required properties:

- compatible : "brcm,kona-smc"

- DEPRECATED: compatible : "bcm,kona-smc"

- reg : Location and size of bounce buffer



Example:

	smc@3404c000 {

		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";

		reg = <0x3404c000 0x400>; //1 KiB in SRAM

	};

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

+5 −1
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ description: 
  These chips also have a Bluetooth portion described in a separate

  binding.



allOf:

  - $ref: ieee80211.yaml#



properties:

  compatible:

    oneOf:
@@ -38,6 +41,7 @@ properties: 
              - brcm,bcm4354-fmac

              - brcm,bcm4356-fmac

              - brcm,bcm4359-fmac

              - brcm,bcm4366-fmac

              - cypress,cyw4373-fmac

              - cypress,cyw43012-fmac

          - const: brcm,bcm4329-fmac
@@ -120,7 +124,7 @@ required: 
  - compatible

  - reg



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
Broadcom Kona Family Reset Manager

----------------------------------



The reset manager is used on the Broadcom BCM21664 SoC.



Required properties:

  - compatible: brcm,bcm21664-resetmgr

  - reg: memory address & range



Example:

	brcm,resetmgr@35001f00 {

		compatible = "brcm,bcm21664-resetmgr";

		reg = <0x35001f00 0x24>;

	};