[PATCH] ARM: dts: npcm7xx: Move memory controller node into common devicetree

Kun Yi kunyi at google.com
Thu Mar 5 05:57:39 AEDT 2020


Include the EDAC node in the common devicetree piece so that downstream
boards don't have to repeat the definitions to enable EDAC.

Signed-off-by: Kun Yi <kunyi at google.com>
---
 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 7 +++++++
 arch/arm/boot/dts/nuvoton-npcm730-gsj.dts     | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
index 72841f54deb4..f17e60280200 100644
--- a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
+++ b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
@@ -137,6 +137,13 @@
 			status = "disabled";
 		};
 
+		mc: memory-controller at f0824000 {
+			compatible = "nuvoton,npcm7xx-sdram-edac";
+			reg = <0xf0824000 0x1000>;
+			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
+		};
+
 		emc0: eth at f0825000 {
 			device_type = "network";
 			compatible = "nuvoton,npcm750-emc";
diff --git a/arch/arm/boot/dts/nuvoton-npcm730-gsj.dts b/arch/arm/boot/dts/nuvoton-npcm730-gsj.dts
index 801ed73d962c..b587df73b4cb 100644
--- a/arch/arm/boot/dts/nuvoton-npcm730-gsj.dts
+++ b/arch/arm/boot/dts/nuvoton-npcm730-gsj.dts
@@ -41,9 +41,7 @@
 		};
 
 		mc: memory-controller at f0824000 {
-			compatible = "nuvoton,npcm7xx-sdram-edac";
-			reg = <0xf0824000 0x1000>;
-			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+			status = "okay";
 		};
 
 		emc0: eth at f0825000 {
-- 
2.25.1.481.gfbce0eb801-goog



More information about the openbmc mailing list