Skip to content

Commit de79649

Browse files
committed
Merge tag 'arm-soc/for-6.9/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/late
This pull request contains Broadcom ARM64-based SoCs changes for 6.9, please pull the following: - Rafal defines a proper NVMEM layout for the Asus GT-AC5300 router and removes some invalid Device Tree properties pertaining to the Ethernet switch on bcm4908 * tag 'arm-soc/for-6.9/devicetree-arm64' of https://github.com/Broadcom/stblinux: arm64: dts: broadcom: bcmbca: bcm4908: drop invalid switch cells arm64: dts: broadcom: bcmbca: bcm4908: use NVMEM layout for Asus GT-AC5300 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ee7dad0 + 27058b9 commit de79649

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,17 @@
181181
#size-cells = <1>;
182182

183183
partition@0 {
184-
compatible = "nvmem-cells";
185184
label = "cferom";
186185
reg = <0x0 0x100000>;
187186

188-
#address-cells = <1>;
189-
#size-cells = <1>;
190-
ranges = <0 0x0 0x100000>;
187+
nvmem-layout {
188+
compatible = "fixed-layout";
189+
#address-cells = <1>;
190+
#size-cells = <1>;
191191

192-
base_mac_addr: mac@106a0 {
193-
reg = <0x106a0 0x6>;
192+
base_mac_addr: mac@106a0 {
193+
reg = <0x106a0 0x6>;
194+
};
194195
};
195196
};
196197

arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@
227227
brcm,num-gphy = <5>;
228228
brcm,num-rgmii-ports = <2>;
229229

230-
#address-cells = <1>;
231-
#size-cells = <0>;
232-
233230
ports: ports {
234231
#address-cells = <1>;
235232
#size-cells = <0>;

0 commit comments

Comments
 (0)