summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6dl-apf6dev.dts
diff options
context:
space:
mode:
authorMarco Franchi <marco.franchi@nxp.com>2018-12-05 19:10:03 +0100
committerShawn Guo <shawnguo@kernel.org>2018-12-10 03:03:07 +0100
commit404c0c9314f4f204ad82ef059424ff7e0b20fcd0 (patch)
tree7e3ce4ac7722f42620b41fe98c60fcf2b91cb518 /arch/arm/boot/dts/imx6dl-apf6dev.dts
parentARM: dts: imx6dl-mamoj: Add a memory node (diff)
downloadlinux-404c0c9314f4f204ad82ef059424ff7e0b20fcd0.tar.xz
linux-404c0c9314f4f204ad82ef059424ff7e0b20fcd0.zip
ARM: dts: imx6qdl: Fix memory node duplication
Boards based on imx6qdl have duplicate memory nodes: - One coming from the board device tree file: memory@ - One coming from the imx6qdl.dtsi file. Fix the duplication by removing the memory node from the imx6qdl.dtsi file and by adding 'device_type = "memory";' in the board Device Tree. Converted using the following command: perl -p0777i -e 's/memory\@10000000 \{\n/memory\@10000000 \{\n\t\tdevice_type = \"memory\";\n/m' `find ./arch/arm/boot/dts -name "imx6*"`` Reported-by: Rob Herring <robh@kernel.org> Signed-off-by: Marco Franchi <marco.franchi@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-apf6dev.dts')
-rw-r--r--arch/arm/boot/dts/imx6dl-apf6dev.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl-apf6dev.dts b/arch/arm/boot/dts/imx6dl-apf6dev.dts
index 4a7f86de6c39..6632e99fbb68 100644
--- a/arch/arm/boot/dts/imx6dl-apf6dev.dts
+++ b/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -55,6 +55,7 @@
compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
memory@10000000 {
+ device_type = "memory";
reg = <0x10000000 0x20000000>;
};
};