diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-07-30 18:21:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-07-30 18:21:40 +0200 |
| commit | 0018c39d0a36452de835e71a15565a41319ab8aa (patch) | |
| tree | 403a139ae18d3be5c3d021eabe052011a0c3a9e5 | |
| parent | 038d61fd642278bab63ee8ef722c50d10ab01e8f (diff) | |
| parent | 0c927d478486fbc96a225aeae6705e7152700c87 (diff) | |
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 501be7cecec9
("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 <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/broadcom/bcm7445.dtsi | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm7445.dtsi b/arch/arm/boot/dts/broadcom/bcm7445.dtsi index 5ac2042515b8f..c6307c7437e3b 100644 --- a/arch/arm/boot/dts/broadcom/bcm7445.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm7445.dtsi @@ -237,7 +237,8 @@ ranges = <0x0 0x0 0x80000>; memc-ddr@2000 { - compatible = "brcm,brcmstb-memc-ddr"; + compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x", + "brcm,brcmstb-memc-ddr"; reg = <0x2000 0x800>; }; @@ -259,7 +260,8 @@ ranges = <0x0 0x80000 0x80000>; memc-ddr@2000 { - compatible = "brcm,brcmstb-memc-ddr"; + compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x", + "brcm,brcmstb-memc-ddr"; reg = <0x2000 0x800>; }; @@ -281,7 +283,8 @@ ranges = <0x0 0x100000 0x80000>; memc-ddr@2000 { - compatible = "brcm,brcmstb-memc-ddr"; + compatible = "brcm,brcmstb-memc-ddr-rev-b.1.x", + "brcm,brcmstb-memc-ddr"; reg = <0x2000 0x800>; }; |