summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2018-11-20 18:59:43 +0300
committerShawn Guo <shawnguo@kernel.org>2018-12-10 05:02:25 +0300
commit750d8df6e7b269b828f66631a1d39ea027afc92a (patch)
tree4bbc299ab8eedc20fb048f819ee613dd26d9ba4c /arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
parent76368cca639e95b1c15d3a3abcc3b72e1afdbb5a (diff)
downloadlinux-750d8df6e7b269b828f66631a1d39ea027afc92a.tar.xz
ARM: dts: imx6ul: Fix memory node duplication
Boards based on imx6ul have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx6ul.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/imx6ull-colibri-wifi.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 183193e8580d..038d8c90f6df 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -7,6 +7,7 @@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x20000000>;
};