Unverified Commit 0018c39d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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 501be7ce
  ("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: default avatarArnd Bergmann <arnd@arndb.de>
parents 038d61fd 0c927d47

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

+6 −3
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ memc@0 { 
			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 @@ memc@80000 { 
			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 @@ memc@100000 { 
			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>;

			};