Unverified Commit 814cc4fc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.19/devicetree' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 5.19, please pull the following:

- Oleksij fixes the ethernet node name for the USB Ethernet adapter on
  BCM283x (Raspberry Pi 1/2/3) platforms

- Kuldeep fixes the PL022 SPI controller clock names to conform to the
  binding

- Rafal updates the various BCM5301X (Northstar) Device Tree include
  files to be dtsschema conforming for pinctrl, NAND

- Arinc adds the Asus RT-AC88U binding, removes some unnecessary
  properties of the Ethernet switch DT node, populates the correct PHY
  interface for port 5 of the switch, adds support for fetching the MAC
  address from the NVMEM provider and finally disables gmac0 on that
  device which is unused

- Phil updates the Raspberry Pi 1/2/3 DTS files to have the latest gpio
  line names conforming to the printed circuit board layout

- Krzysztof updates various Broadcom DTS files to have a conforming SPI
  nor Device Tree node

- Takayoshi adds support for the Buffalo WZR-1166DHP/WZR-1166DHP2
  wireless routers based on the BCM4708 SoC

- William adds support for the BCM47622 ARMv7 Broadband SoC and provides
  a basic DTS to boot upstream Linux on such a system

* tag 'arm-soc/for-5.19/devicetree' of https://github.com/Broadcom/stblinux: (22 commits)
  ARM: dts: BCM5301X: Add DT for WZR-1166DHP,DHP2
  ARM: dts: add dts files for bcmbca soc 47622
  dt-bindings: arm: add bcmbca device tree binding document
  ARM: dts: bcm283x: Align ETH_CLK GPIO line name
  ARM: dts: bcm283x: Remove gpio line name NC
  ARM: dts: bcm2835-rpi-b: Fix GPIO line names
  ARM: dts: bcm2837-rpi-3-b-plus: Fix GPIO line name of power LED
  ARM: dts: bcm2837-rpi-cm3-io3: Fix GPIO line names for SMPS I2C
  ARM: dts: bcm2835-rpi-zero-w: Fix GPIO line name for Wifi/BT
  ARM: dts: BCM5301X: Disable gmac0 and enable port@8 on Asus RT-AC88U
  ARM: dts: broadcom: align SPI NOR node name with dtschema
  dt-bindings: arm: bcm: add bindings for Asus RT-AC88U
  ARM: dts: BCM5301X: Fix compatible strings for BCM53012 and BCM53016 SoC
  dt-bindings: arm: bcm: create new description for BCM53016
  dt-bindings: arm: bcm: fix BCM53012 and BCM53016 SoC strings
  ARM: dts: BCM5301X: Retrieve gmac1 MAC address from NVRAM on Asus RT-AC88U
  ARM: dts: BCM5301X: Add rgmii to port@5 of Broadcom switch on Asus RT-AC88U
  ARM: dts: BCM5301X: Remove cell properties from srab ports on Asus RT-AC88U
  ARM: dts: BCM5301X: Fix DTC warning for NAND node
  ARM: dts: BCM5301X: Update pin controller node name
  ...

Link: https://lore.kernel.org/r/20220504210942.1838248-2-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e8bcacda 417aea44

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

+8 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ properties: 
      - description: BCM47094 based boards

        items:

          - enum:

              - asus,rt-ac88u

              - dlink,dir-885l

              - linksys,panamera

              - luxul,abr-4500-v1
@@ -83,9 +84,14 @@ properties: 
              - brcm,bcm953012er

              - brcm,bcm953012hr

              - brcm,bcm953012k

          - const: brcm,bcm53012

          - const: brcm,bcm4708



      - description: BCM53016 based boards

        items:

          - enum:

              - meraki,mr32

          - const: brcm,brcm53012

          - const: brcm,brcm53016

          - const: brcm,bcm53016

          - const: brcm,bcm4708



additionalProperties: true

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

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/bcm/brcm,bcmbca.yaml#

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



title: Broadcom Broadband SoC device tree bindings



description:

  Broadcom Broadband SoCs include family of high performance DSL/PON/Wireless

  chips that can be used as home gateway, router and WLAN AP for residential,

  enterprise and carrier applications.



maintainers:

  - William Zhang <william.zhang@broadcom.com>

  - Anand Gore <anand.gore@broadcom.com>

  - Kursad Oney <kursad.oney@broadcom.com>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - description: BCM47622 based boards

        items:

          - enum:

              - brcm,bcm947622

          - const: brcm,bcm47622

          - const: brcm,bcmbca



additionalProperties: true



...

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm4708-asus-rt-ac56u.dtb \

	bcm4708-asus-rt-ac68u.dtb \

	bcm4708-buffalo-wzr-1750dhp.dtb \

	bcm4708-buffalo-wzr-1166dhp.dtb \

	bcm4708-buffalo-wzr-1166dhp2.dtb \

	bcm4708-linksys-ea6300-v1.dtb \

	bcm4708-linksys-ea6500-v2.dtb \

	bcm4708-luxul-xap-1510.dtb \
@@ -179,6 +181,8 @@ dtb-$(CONFIG_ARCH_BERLIN) += \ 
	berlin2q-marvell-dmp.dtb

dtb-$(CONFIG_ARCH_BRCMSTB) += \

	bcm7445-bcm97445svmb.dtb

dtb-$(CONFIG_ARCH_BCMBCA) += \

	bcm947622.dtb

dtb-$(CONFIG_ARCH_CLPS711X) += \

	ep7211-edb7211.dtb

dtb-$(CONFIG_ARCH_DAVINCI) += \

arch/arm/boot/dts/bcm-cygnus.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -397,8 +397,8 @@ 
			#size-cells = <0>;

			interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-0 = <&spi_0>;

			clocks = <&axi81_clk>;

			clock-names = "apb_pclk";

			clocks = <&axi81_clk>, <&axi81_clk>;

			clock-names = "sspclk", "apb_pclk";

			status = "disabled";

		};
@@ -409,8 +409,8 @@ 
			#size-cells = <0>;

			interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-0 = <&spi_1>;

			clocks = <&axi81_clk>;

			clock-names = "apb_pclk";

			clocks = <&axi81_clk>, <&axi81_clk>;

			clock-names = "sspclk", "apb_pclk";

			status = "disabled";

		};
@@ -421,8 +421,8 @@ 
			#size-cells = <0>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;

			pinctrl-0 = <&spi_2>;

			clocks = <&axi81_clk>;

			clock-names = "apb_pclk";

			clocks = <&axi81_clk>, <&axi81_clk>;

			clock-names = "sspclk", "apb_pclk";

			status = "disabled";

		};

arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

+10 −11
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
	 * This is based on the unreleased schematic for the Model A+.

	 *

	 * Legend:

	 * "NC" = not connected (no rail from the SoC)

	 * "FOO" = GPIO line named "FOO" on the schematic

	 * "FOO_N" = GPIO line named "FOO" on schematic, active low

	 */
@@ -67,21 +66,21 @@ 
			  "GPIO27",

			  "SDA0",

			  "SCL0",

			  "NC", /* GPIO30 */

			  "NC", /* GPIO31 */

			  "", /* GPIO30 */

			  "", /* GPIO31 */

			  "CAM_GPIO1", /* GPIO32 */

			  "NC", /* GPIO33 */

			  "NC", /* GPIO34 */

			  "", /* GPIO33 */

			  "", /* GPIO34 */

			  "PWR_LOW_N", /* GPIO35 */

			  "NC", /* GPIO36 */

			  "NC", /* GPIO37 */

			  "", /* GPIO36 */

			  "", /* GPIO37 */

			  "USB_LIMIT", /* GPIO38 */

			  "NC", /* GPIO39 */

			  "", /* GPIO39 */

			  "PWM0_OUT", /* GPIO40 */

			  "CAM_GPIO0", /* GPIO41 */

			  "NC", /* GPIO42 */

			  "NC", /* GPIO43 */

			  "NC", /* GPIO44 */

			  "", /* GPIO42 */

			  "", /* GPIO43 */

			  "", /* GPIO44 */

			  "PWM1_OUT", /* GPIO45 */

			  "HDMI_HPD_N",

			  "STATUS_LED",