Unverified Commit 0bf88b16 authored Mar 14, 2025 by Arnd Bergmann

Merge tag 'arm-soc/for-6.14/devicetree-fixes-part2' of...

Merge tag 'arm-soc/for-6.14/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux into arm/fixes

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

- Chester fixes the switch port assignments on the ASUS RT-AC3200 and
  RT-AC5300 routers

- Phil removes a Device Tree property flagging the BCM2711 ARM timers as
  not being configured which would have prevented the use of vDSO on the
  Pi 4 running a 32-bit kernel

* tag 'arm-soc/for-6.14/devicetree-fixes-part2' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: Fix switch port labels of ASUS RT-AC3200
  ARM: dts: BCM5301X: Fix switch port labels of ASUS RT-AC5300
  ARM: dts: bcm2711: Don't mark timer regs unconfigured

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


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

parents 98f3ab18 24d4c56d

arch/arm/boot/dts/broadcom/bcm2711.dtsi

+0 −2

Original line number	Diff line number	Diff line
		@@ -451,8 +451,6 @@ IRQ_TYPE_LEVEL_LOW)>,
		IRQ_TYPE_LEVEL_LOW)>,
		<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) \|
		IRQ_TYPE_LEVEL_LOW)>;
		/* This only applies to the ARMv7 stub */
		arm,cpu-registers-not-fw-configured;
		};

		cpus: cpus {

arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -124,19 +124,19 @@ port@0 {
		};

		port@1 {
		label = "lan1";
		label = "lan4";
		};

		port@2 {
		label = "lan2";
		label = "lan3";
		};

		port@3 {
		label = "lan3";
		label = "lan2";
		};

		port@4 {
		label = "lan4";
		label = "lan1";
		};
		};
		};

arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts

+4 −4

Original line number	Diff line number	Diff line
		@@ -126,11 +126,11 @@ &srab {

		ports {
		port@0 {
		label = "lan4";
		label = "wan";
		};

		port@1 {
		label = "lan3";
		label = "lan1";
		};

		port@2 {
		@@ -138,11 +138,11 @@ port@2 {
		};

		port@3 {
		label = "lan1";
		label = "lan3";
		};

		port@4 {
		label = "wan";
		label = "lan4";
		};
		};
		};