Unverified Commit 44762a0c authored Aug 21, 2023 by Arnd Bergmann

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

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

- Arinc adds support for the Asus RT-AC3100 router based upon the
  BCM47094 SoC

- Krzysztof splits interrupt properties per cell such that they are mode
  readable and adds missing spaces in front of node names/labels

- Rafal updates the BCM5301X DTS to correct PCIe, SPI over GPIO
  properties. He describes the Ethernet links to internal switch ports
  and then updates the BCM53573 binding and Ethernet properties by
  declaring the BCM53125 external switch on port 5, add Ethernet links
and
  disables the second Ethernet MAC on Luxul devices.

- Dan describes the Wi-Fi regulatory mappings for Luxul devices

- Stanislav updates the bcm28155 DTS to use node labels

- Linus adds SEAMA compatible properties to MTD partitions

- Aleksey updates the Linksys EA6500 v2 to have the full 256MiB of DRAM
  available

- Stefan updates a number of BCM283x nodes to confirm to DTS schema:
  pinctrl, DMA controllers and PWM cells.

* tag 'arm-soc/for-6.6/devicetree' of https://github.com/Broadcom/stblinux: (23 commits)
  ARM: dts: BCM5301X: Add DT for ASUS RT-AC3100
  dt-bindings: arm: bcm: add bindings for ASUS RT-AC3100
  ARM: dts: broadcom: split interrupts per cells
  ARM: dts: BCM53573: Disable second Ethernet on Luxul devices
  ARM: dts: BCM53573: Add Ethernet interfaces links
  ARM: dts: BCM53573: Add BCM53125 switch port 5
  ARM: dts: BCM53573: Describe BCM53125 switch ports in the main DTS
  ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
  ARM: dts: bcm28155-ap: use node labels
  ARM: dts: bcm5301x: Add SEAMA compatibles
  ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
  ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2
  dt-bindings: arm: bcm: add BCM53573 SoCs family binding
  ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
  ARM: dts: BCM53573: Add cells sizes to PCIe node
  ARM: dts: BCM53573: Drop nonexistent #usb-cells
  ARM: dts: BCM53573: Drop nonexistent "default-off" LED trigger
  ARM: dts: BCM5301X: Add Ethernet interfaces links
  ARM: dts: BCM5301X: Add Wi-Fi regulatory mappings for Luxul devices
  ARM: dts: broadcom: add missing space before {
  ...

Link: https://lore.kernel.org/r/20230818164539.2871539-1-florian.fainelli@broadcom.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents c708140e 29000832

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ properties:
		- description: BCM47094 based boards
		items:
		- enum:
		- asus,rt-ac3100
		- asus,rt-ac88u
		- dlink,dir-885l
		- dlink,dir-890l

Documentation/devicetree/bindings/arm/bcm/brcm,bcm53573.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/arm/bcm/brcm,bcm53573.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Broadcom BCM53573 SoCs family

		description:
		Broadcom BCM53573 / BCM47189 Wi-Fi SoCs derived from Northstar.

		maintainers:
		- Rafał Miłecki <rafal@milecki.pl>

		properties:
		$nodename:
		const: '/'
		compatible:
		oneOf:
		- description: BCM53573 based boards
		items:
		- enum:
		- tenda,ac6-v1
		- tenda,w15e-v1
		- const: brcm,bcm53573

		- description: BCM47189 based boards
		items:
		- enum:
		- brcm,bcm947189acdbmr
		- luxul,xap-810-v1
		- luxul,xap-1440-v1
		- tenda,ac9
		- const: brcm,bcm47189
		- const: brcm,bcm53573

		additionalProperties: true

		...

arch/arm/boot/dts/broadcom/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
		bcm4709-netgear-r7000.dtb \
		bcm4709-netgear-r8000.dtb \
		bcm4709-tplink-archer-c9-v1.dtb \
		bcm47094-asus-rt-ac3100.dtb \
		bcm47094-asus-rt-ac88u.dtb \
		bcm47094-dlink-dir-885l.dtb \
		bcm47094-dlink-dir-890l.dtb \

arch/arm/boot/dts/broadcom/bcm-hr2.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,8 @@

		pmu {
		compatible = "arm,cortex-a9-pmu";
		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH
		GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-affinity = <&cpu0>;
		};

arch/arm/boot/dts/broadcom/bcm-ns.dtsi

+18 −0

Original line number	Diff line number	Diff line
		@@ -272,14 +272,32 @@

		gmac0: ethernet@24000 {
		reg = <0x24000 0x800>;
		phy-mode = "internal";

		fixed-link {
		speed = <1000>;
		full-duplex;
		};
		};

		gmac1: ethernet@25000 {
		reg = <0x25000 0x800>;
		phy-mode = "internal";

		fixed-link {
		speed = <1000>;
		full-duplex;
		};
		};

		gmac2: ethernet@26000 {
		reg = <0x26000 0x800>;
		phy-mode = "internal";

		fixed-link {
		speed = <1000>;
		full-duplex;
		};
		};

		gmac3: ethernet@27000 {