Skip to content

Commit 0018c39

Browse files
committed
Merge tag 'arm-soc/for-6.16/devicetree-fixes' of https://github.com/Broadcom/stblinux into for-next
This pull request contains Device Tree fixes for Broadcom ARM-based SoC platforms, please pull the following: - Florian fixes the bcm7445.dtsi file to conform to the brcm,brcm,brcmstb-memc-ddr.yaml binding after 501be7c ("dt-bindings: memory-controller: Define fallback compatible") * tag 'arm-soc/for-6.16/devicetree-fixes' of https://github.com/Broadcom/stblinux: ARM: dts: broadcom: Fix bcm7445 memory controller compatible Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 038d61f + 0c927d4 commit 0018c39

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@
237237
ranges = <0x0 0x0 0x80000>;
238238

239239
memc-ddr@2000 {
240-
compatible = "brcm,brcmstb-memc-ddr";
240+
compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
241+
"brcm,brcmstb-memc-ddr";
241242
reg = <0x2000 0x800>;
242243
};
243244

@@ -259,7 +260,8 @@
259260
ranges = <0x0 0x80000 0x80000>;
260261

261262
memc-ddr@2000 {
262-
compatible = "brcm,brcmstb-memc-ddr";
263+
compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
264+
"brcm,brcmstb-memc-ddr";
263265
reg = <0x2000 0x800>;
264266
};
265267

@@ -281,7 +283,8 @@
281283
ranges = <0x0 0x100000 0x80000>;
282284

283285
memc-ddr@2000 {
284-
compatible = "brcm,brcmstb-memc-ddr";
286+
compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x",
287+
"brcm,brcmstb-memc-ddr";
285288
reg = <0x2000 0x800>;
286289
};
287290

0 commit comments

Comments
 (0)