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>

diff --git a/arch/arm/boot/dts/imx6dl-apf6dev.dts b/arch/arm/boot/dts/imx6dl-apf6dev.dts
index 4a7f86de6c39b5e302b601cfa2436af61e049112..6632e99fbb6860dae0af7204316c4b6b7e484719 100644 (file)
--- 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>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
index 29940ba215a88e24a7677de4762b319947cd7e14..b16603f27dce7d0d6f0d012fb7d1ff3413983699 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
@@ -49,6 +49,7 @@
        compatible = "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
index 240f3661469fde1d750214c6b9820c0e86308757..abb2a1b9ce08df085f44bc4e994bccab27831cf7 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
@@ -49,6 +49,7 @@
        compatible = "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
index ad7733662fe5750ce23db526a9be57f017ccb9f8..b87a85cd44acb4b94e9fa1181c335e499c83502b 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@ -28,6 +28,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
index 64ed84e3c51283fc760b431561dbab10f5b7a96e..e71ad9062fd11deeab868f31fa683a006c785e44 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
@@ -17,6 +17,7 @@
        compatible = "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index d08e0402793bc05e17de67c177e1fdc3794df584..d5f7a1703aaed269c3ba2e344842b416f22945bb 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -55,6 +55,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
index 89384cb618f60f3c7cbb60106484db967fb20a67..588286adee6758ffc61ad959343c81e06bcdf762 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
+++ b/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
@@ -23,6 +23,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
index 7d9888937f12f1458fe4589a87bd93bf47c521d5..d7e72993eaf817388d3458943f1a9bab930f2972 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
@@ -17,6 +17,7 @@
        compatible = "phytec,imx6dl-pfla02", "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-rex-basic.dts b/arch/arm/boot/dts/imx6dl-rex-basic.dts
index 3fb7f4ee2496f21a7c66cc781e59e86265d0488e..853e58defa9c983b254f86c367a09527b948d73f 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-rex-basic.dts
+++ b/arch/arm/boot/dts/imx6dl-rex-basic.dts
@@ -17,6 +17,7 @@
        compatible = "rex,imx6dl-rex-basic", "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 8e51491e68cfdc68c83cb29f6e21be8f24398a2e..65c184bb8fb05b275d143d207ca4176b8dda3617 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -16,6 +16,7 @@
        compatible = "riot,imx6s-riotboard", "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6dl-ts4900.dts b/arch/arm/boot/dts/imx6dl-ts4900.dts
index cc01a7a22e30850f25b56b77cfa26c40a23cee27..3d60cc725d9e4ccfaf267d30a3468869074c18bd 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-ts4900.dts
+++ b/arch/arm/boot/dts/imx6dl-ts4900.dts
@@ -49,6 +49,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-ts7970.dts b/arch/arm/boot/dts/imx6dl-ts7970.dts
index 82435d5bf33f970cfee152b6f4c55413198c0229..5da6feba2e66a3b3b57429f0e36ead18a63544f6 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-ts7970.dts
+++ b/arch/arm/boot/dts/imx6dl-ts7970.dts
@@ -50,6 +50,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
index 738db4fc77023c9b758787279e6d520dcffca321..c2946fbaa0dd44024022a49df13fda1c9b8fcbec 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts b/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
index 51de6b4bd7d82c7cb2812fa4366f829775178daf..6d1d863c2e3a6a7af6276e16bba9cecbe3cf8bca 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-wandboard.dts b/arch/arm/boot/dts/imx6dl-wandboard.dts
index b43454deaa1aac8da81e5c62c5088de245e084d1..4a08d5a9945221b1572dc0cbfc6bbbafa6761e93 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-apf6dev.dts b/arch/arm/boot/dts/imx6q-apf6dev.dts
index 5e72f81cdf8b158dd884dce99cb44d74408b79fd..07a36bb8075bd9723672895ed6d962f52c9a28fd 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apf6dev.dts
+++ b/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -55,6 +55,7 @@
        compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 953a5b5a8ea411bd816e947188ecae58dcc7a63d..baadcb7fe0116100321324ebad5f37c4a82e58f7 100644 (file)
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -19,6 +19,7 @@
        compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba16.dtsi
index e903c488287bc57aeabfeb7375f4d1241dfdcd92..adc9455e42c743f9c0ac835f30bbdfdd0765e188 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ba16.dtsi
+++ b/arch/arm/boot/dts/imx6q-ba16.dtsi
@@ -47,6 +47,7 @@
 
 / {
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index 18ae4f3be6e38f93a9421ca4152e7a11bf43ad23..cab9e92531c7f54636e174431aaaa6e2b087ad7e 100644 (file)
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -51,6 +51,7 @@
        compatible = "compulab,cm-fx6", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
index ad12d76bbb89a31f8178bc93e487d68531cf6b01..e13acbbcdff4da0d1c5ff92ed3cceb2be2ca2f51 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
+++ b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
@@ -23,6 +23,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
index bbba0671f0f414401aad0bbbc4193b7ad970dfb6..387801dde02e22be00890b98bc05f88d07aed0f4 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
+++ b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
@@ -19,6 +19,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-display5.dtsi b/arch/arm/boot/dts/imx6q-display5.dtsi
index 85232c7c36a0176d5bd7c03a278aa59f8a6515d7..83524bb99eb3d17806ffbb83060cda41ee3113a1 100644 (file)
--- a/arch/arm/boot/dts/imx6q-display5.dtsi
+++ b/arch/arm/boot/dts/imx6q-display5.dtsi
@@ -48,6 +48,7 @@
        compatible = "lwn,display5", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index b3c6a4a7897d9bb97bce154961ba1c3e15cd1345..ee8c38eee03b0fd5b229eef15107083b66fd9b25 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -30,6 +30,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts
index fcd257bc5ac30bd5c0486fd67a543655917257e5..c63f371ede8b98f7952c5f03b22bb7f99918acaf 100644 (file)
--- a/arch/arm/boot/dts/imx6q-evi.dts
+++ b/arch/arm/boot/dts/imx6q-evi.dts
@@ -51,6 +51,7 @@
        compatible = "uniwest,imx6q-evi", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-gk802.dts b/arch/arm/boot/dts/imx6q-gk802.dts
index 84d3540b3a97f0d39f2b810eb65ba9eab3d3c263..ccc2487d47ca9bdde04ca0f9d2f0492b6539ef4a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@@ -20,6 +20,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index a8f70b4266ef881472786b2d2085152918088bab..4038170369fc8f674c96edd615f2adc6f8177438 100644 (file)
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -61,6 +61,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts
index 714e09e04dcb7d2558aee12a75837e5f0aa352ce..b8feadbff967dbd6a62778b60be894771f2da108 100644 (file)
--- a/arch/arm/boot/dts/imx6q-h100.dts
+++ b/arch/arm/boot/dts/imx6q-h100.dts
@@ -51,6 +51,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-kp-tpc.dts b/arch/arm/boot/dts/imx6q-kp-tpc.dts
index 302d8d06e4cc34b6cba76527adbfe2e3dee2b3bb..50fbf46d17c297b47bfefb365f654177ffd1def8 100644 (file)
--- a/arch/arm/boot/dts/imx6q-kp-tpc.dts
+++ b/arch/arm/boot/dts/imx6q-kp-tpc.dts
@@ -13,6 +13,7 @@
        compatible = "kiebackpeter,imx6q-tpc", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
index dd763f20581907d028207d33947fff688f5c5ea3..d8ccb533b6b7acee381e6b9f9297865626043d1d 100644 (file)
--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@@ -48,6 +48,7 @@
        compatible = "embest,imx6q-marsboard", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-mccmon6.dts b/arch/arm/boot/dts/imx6q-mccmon6.dts
index b7e9f38cec729993f4b73b889a71be988b6cf995..74d9824e920b78c4972f4c55ef70e527806e54db 100644 (file)
--- a/arch/arm/boot/dts/imx6q-mccmon6.dts
+++ b/arch/arm/boot/dts/imx6q-mccmon6.dts
@@ -20,6 +20,7 @@
        compatible = "lwn,mccmon6", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index fcd824dc485bb6009ea751d38b8b703f29e61667..61347a545d6c2136b24740807711bd6c0495d914 100644 (file)
--- a/arch/arm/boot/dts/imx6q-novena.dts
+++ b/arch/arm/boot/dts/imx6q-novena.dts
@@ -57,6 +57,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
index fad858c30fe9d5413c17084f5b455b1e2868e22c..097f2c56c20ba19595dbdccf36989aa563c8a107 100644 (file)
--- a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
@@ -17,6 +17,7 @@
        compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-pistachio.dts b/arch/arm/boot/dts/imx6q-pistachio.dts
index a31e83cd07a30a3c597a8d68805e3d5e1eacbf46..5edf858c8b860e840c8515d094a1b13fe8f7ef91 100644 (file)
--- a/arch/arm/boot/dts/imx6q-pistachio.dts
+++ b/arch/arm/boot/dts/imx6q-pistachio.dts
@@ -57,6 +57,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-rex-pro.dts b/arch/arm/boot/dts/imx6q-rex-pro.dts
index d6cae73b19272e4ccd171cae4199737ec367b274..aa3004eab06c2a0ee66440c8172175aec467c1cb 100644 (file)
--- a/arch/arm/boot/dts/imx6q-rex-pro.dts
+++ b/arch/arm/boot/dts/imx6q-rex-pro.dts
@@ -17,6 +17,7 @@
        compatible = "rex,imx6q-rex-pro", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-sbc6x.dts b/arch/arm/boot/dts/imx6q-sbc6x.dts
index b7aa2f0b9f5359cc9fe986c79659dad14ee69a33..3129f727750faf7502c75ba75d4b48f38f42a365 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sbc6x.dts
+++ b/arch/arm/boot/dts/imx6q-sbc6x.dts
@@ -13,6 +13,7 @@
        compatible = "microsys,sbc6x", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
index 505cba776a2dfdeaf457a4b52a7a93472ce0beb0..279b15e9ae2e826f4c0a432c4862d8d03b5be1b8 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@@ -60,6 +60,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6q-ts4900.dts b/arch/arm/boot/dts/imx6q-ts4900.dts
index e655107edc564e46e072bbedae388104ed8be4c0..dce1e8671ebeafb96fd95dabd65bde02e783f2e2 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ts4900.dts
+++ b/arch/arm/boot/dts/imx6q-ts4900.dts
@@ -49,6 +49,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-ts7970.dts b/arch/arm/boot/dts/imx6q-ts7970.dts
index c615ac4feede152a9e28d7ffaca443ed3609d7c6..570bd3c309a6e5bc3e7b67d004ff8e95428bbdc6 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ts7970.dts
+++ b/arch/arm/boot/dts/imx6q-ts7970.dts
@@ -50,6 +50,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
index be85b980bdfef2474b8130b943adf6625037c7ec..f6ccbecff92c21537e2f7a8a33c1ef8c5742df8e 100644 (file)
--- a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-wandboard-revd1.dts b/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
index fcfba28764d4ad7b48913bb209dd86adc5873cec..55331021d80cfb149529df0d3e9f9da16d485424 100644 (file)
--- a/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-wandboard.dts b/arch/arm/boot/dts/imx6q-wandboard.dts
index fa36fe183fc0b9d9024e02882475399354391bce..0be548beef86d6125ae8e482650d08f7abb6586a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-wandboard.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
index 7da6dde9c8578ec54e2ebaf6d7f3c76ab3210b82..0f0743db27798c35153ea7646d17131c5a7553e0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
@@ -50,6 +50,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 3dc99dd8dde178e612546490ef24b6b613a5fc83..8380f1b26826c320e8e98222d9150321283332d5 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -49,6 +49,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 9332a31e6c8b9af02dc017afcdfe2f8d869aea6a..e3be453d8a4a2d4a53a5ddddc2c6bdb86ff03f16 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -44,6 +44,7 @@
 / {
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-emcon.dtsi b/arch/arm/boot/dts/imx6qdl-emcon.dtsi
index bfd5f373921ef0f603fafcb8eddbb04719001115..397e205551c4e3ded319ee73f710613518ef0802 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-emcon.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-emcon.dtsi
@@ -24,6 +24,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
index 17a7b9c083d06ec17b7be9aae9596656895900c0..d3609966b84636c14dbf7b33256bef6a1ed7436a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
@@ -45,6 +45,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index b8044681006c610322637730d97ff1f897b30be5..2ff377d0df7ea4f1c5aa56a270c605c15e5b175e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -60,6 +60,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index 629908fbaa32311282d86d7102a4ae5269eb8263..68ab543511092f30fe577453b8b9529324b00b5f 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -60,6 +60,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index a1a6fb5541e17545d8c5c05c8deb6afcc13ecfc9..81b2fcf6eedfb23c79499ca78160d5092625e989 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -60,6 +60,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
index 4e21b3849394445b856c48a702bf962b85a2918a..8e46a80f57a46f6e9fa295d28b035c0e22d49dd4 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@@ -75,6 +75,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
index 81dae5b5bc874f5bf7144a5123237098fff0d88e..dacc2a14d0e71eff513aeec93c38632b8ea56b2d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
@@ -52,6 +52,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
index c5d95e8d2e099bbe57ae4623b1c0c4c5db89e086..a1066897be188956da7e6bdf15a4ce69e3746d04 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
@@ -81,6 +81,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
index b5986efe1090c45ad8c2df75d1f94ab81f193b00..e8e36dfd0a6b04f8ee057a420bbfd99861aadd3a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
@@ -114,6 +114,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
index 368132274a91dfcd0c08a09e92b830fa2d24afd1..9cb9a743912187d52ddfdc3cebc4a1f7f3741307 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
@@ -84,6 +84,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
index 3c52bdb453f332cacbd0f7438cc5d799f3a2758b..6d21cc6a9d4b1a822f3e5102209f905066905208 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
@@ -94,6 +94,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 0e64016e765f91806a4386081a12f98901048f5f..2ffb21dd89f2af578524151949a8e526e88ceaeb 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -43,6 +43,7 @@
 / {
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index c413f9c3540fb99fc423db5c98b6030b64e69050..e4231331f04e6ebbc9ea0b4b593ffb5bfeb86ee7 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -43,6 +43,7 @@
 / {
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
index ba93026ecee8810a551c073709aa96b8e1c20ca5..1d1b4bd0670ffd094d2939ed9c91095d8ae8ba39 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
@@ -10,6 +10,7 @@
 
 / {
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi
index aaed37c73c29211e71dc3d25abe97a9f8653058a..7814f1ef08043e67b2ad89dcf479365396e06ea3 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-icore.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi
@@ -10,6 +10,7 @@
 
 / {
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
index 29baf25ae5d04cab3fb123529a3389ea05b5099d..7a85116ef1d2551ca89ad2185d113fdd1f128258 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
@@ -11,6 +11,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index 39200e5dc896568978172c8d3075139b375546a2..c3415aa348a2ca58858d6e26570273ac43ab9625 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -11,6 +11,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0xF0000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
index 572abd7499b174ae431b7f788b85c7c35eeb536b..ed53f07c6b7b52f7c02d038c855e396ec5f1c19e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
@@ -11,6 +11,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 98384a6c5d1295eadd103eabd0ca8f9ce7c4da26..8b0e432099b524c4a60fb9431387521e07ed15e1 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -13,6 +13,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index ed1aafd569735a4dcd6e308767158ae809c27442..1b50b01e9bac8334cbe41a9dd7aaf9e5fa440221 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -16,6 +16,7 @@
        compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index a031023a8c52733b435a04fbb0223831f0c48e70..1280de50a984575b891c5d95d8709c732f32ab03 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -12,6 +12,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 654cf2c9b07342fec5c7046534cd4a1d356ae855..8468216dae9b5fba60ec27223fdc5aff6da57acb 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -50,6 +50,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index d7389b58ef2e69e917d66569b2a8827cb8beb68d..173aa2bd9ccbf2f2c53a9f527aee097cee5935bd 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -13,6 +13,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index a98fb2564c63f47ed59699ac4fc9a5510e158ca3..c68cb90fd801b52eca054e3e1443c2b7b11aa4d5 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -62,6 +62,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>; /* will be filled by U-Boot */
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
index 40d1b0d9faff59d5dfdc3cba485002c961aa6129..776bfc77f89d0982c2f09fe2b47ace4cfa8ab306 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
@@ -32,6 +32,7 @@
        };
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
index 38080c1dfaecbf1518203f827089e90800b15a63..8752a4961c477c7bb91a3bfc83998892fb158a7e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
@@ -11,6 +11,7 @@
 
 / {
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 7fb8be1c9cefabb2d6c1feb4fafbbe5e9d6d1fd4..fe17a3405edc5dd8d095d2b1b67d0f580a847997 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -13,10 +13,8 @@
         * The decompressor and also some bootloaders rely on a
         * pre-existing /chosen node to be available to insert the
         * command line and merge other ATAGS info.
-        * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts b/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
index bcca5ac5fa51087f68c5a5cab5c2734de43f7a9a..08d8b78a2096fcece054612a49fe5ff1ad9b9a6a 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
@@ -13,6 +13,7 @@
        compatible = "wand,imx6qp-wandboard", "fsl,imx6qp";
 
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0x80000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
index 8c293e9f36a701ab1f23feab9c5078f6a3807057..98bf7a6b2850b189b276e10b9c8c6bc5507cfd83 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
@@ -50,6 +50,7 @@
 
        /* Will be filled by the bootloader */
        memory@10000000 {
+               device_type = "memory";
                reg = <0x10000000 0>;
        };
 };