Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+10 -12
-2
arch/arm/boot/dts/broadcom/bcm2711.dtsi
··· 451 451 IRQ_TYPE_LEVEL_LOW)>, 452 452 <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | 453 453 IRQ_TYPE_LEVEL_LOW)>; 454 - /* This only applies to the ARMv7 stub */ 455 - arm,cpu-registers-not-fw-configured; 456 454 }; 457 455 458 456 cpus: cpus {
+6 -6
arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts
··· 124 124 }; 125 125 126 126 port@1 { 127 - label = "lan1"; 127 + label = "lan4"; 128 128 }; 129 129 130 130 port@2 { 131 - label = "lan2"; 132 - }; 133 - 134 - port@3 { 135 131 label = "lan3"; 136 132 }; 137 133 134 + port@3 { 135 + label = "lan2"; 136 + }; 137 + 138 138 port@4 { 139 - label = "lan4"; 139 + label = "lan1"; 140 140 }; 141 141 }; 142 142 };
+4 -4
arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts
··· 126 126 127 127 ports { 128 128 port@0 { 129 - label = "lan4"; 129 + label = "wan"; 130 130 }; 131 131 132 132 port@1 { 133 - label = "lan3"; 133 + label = "lan1"; 134 134 }; 135 135 136 136 port@2 { ··· 138 138 }; 139 139 140 140 port@3 { 141 - label = "lan1"; 141 + label = "lan3"; 142 142 }; 143 143 144 144 port@4 { 145 - label = "wan"; 145 + label = "lan4"; 146 146 }; 147 147 }; 148 148 };