aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-05 19:14:45 -0200
committerShawn Guo <shawnguo@kernel.org>2018-12-10 10:01:57 +0800
commit6a9681168b83c62abfa457c709f2f4b126bd6b92 (patch)
tree921955369c37c0efb0880ef9760c229cb51affe4 /arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
parentARM: dts: imx6: add thermal sensor and cooling cells (diff)
downloadlinux-dev-6a9681168b83c62abfa457c709f2f4b126bd6b92.tar.xz
linux-dev-6a9681168b83c62abfa457c709f2f4b126bd6b92.zip
ARM: dts: imx51: Fix memory node duplication
Boards based on imx51 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx51.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi')
-rw-r--r--arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index 5761a66e8a0d..82d8df097ef1 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -17,6 +17,7 @@
compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";
memory@90000000 {
+ device_type = "memory";
reg = <0x90000000 0x08000000>;
};
};