Skip to content

Commit 0bf88b1

Browse files
committed
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>
2 parents 98f3ab1 + 24d4c56 commit 0bf88b1

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,6 @@
451451
IRQ_TYPE_LEVEL_LOW)>,
452452
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |
453453
IRQ_TYPE_LEVEL_LOW)>;
454-
/* This only applies to the ARMv7 stub */
455-
arm,cpu-registers-not-fw-configured;
456454
};
457455

458456
cpus: cpus {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,19 @@
124124
};
125125

126126
port@1 {
127-
label = "lan1";
127+
label = "lan4";
128128
};
129129

130130
port@2 {
131-
label = "lan2";
131+
label = "lan3";
132132
};
133133

134134
port@3 {
135-
label = "lan3";
135+
label = "lan2";
136136
};
137137

138138
port@4 {
139-
label = "lan4";
139+
label = "lan1";
140140
};
141141
};
142142
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,23 @@
126126

127127
ports {
128128
port@0 {
129-
label = "lan4";
129+
label = "wan";
130130
};
131131

132132
port@1 {
133-
label = "lan3";
133+
label = "lan1";
134134
};
135135

136136
port@2 {
137137
label = "lan2";
138138
};
139139

140140
port@3 {
141-
label = "lan1";
141+
label = "lan3";
142142
};
143143

144144
port@4 {
145-
label = "wan";
145+
label = "lan4";
146146
};
147147
};
148148
};

0 commit comments

Comments
 (0)