ARM: dts: imx: Remove empty memory size nodes

Remove the empty reg property from the SoC dtsi files in order to avoid
duplicate memory nodes when the correct size is passed in board dts files.

Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index 20f6565c337d700a13fcf6071c4c236e4563f280..f7b9edf93f5ef3b558b3b1c6a66a813e353eac38 100644 (file)
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -25,7 +25,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                gpio0 = &gpio1;

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index da935a4fe907ce02165819b768db99214ab77f40..cb0a3fe3271879f750dd9bd24fc3f21ea39789bd 100644 (file)
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -23,7 +23,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                gpio0 = &gpio0;

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 9445f8e1473ccda7b337586596fbc0433175915a..972570568c01d699b2791ec2f4e3e95c7cb56d25 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -22,7 +22,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 15d85f1f85fd5fcf0edf728056f7f4bc6e9b0a19..6585b00c3917a10d94c6abf45e45e059c84626ad 100644 (file)
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -26,7 +26,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index ee3396d21c014b0fbebd1189619fc9b3c6467f32..9ad8d3556859ceb0c7bc516fc11ac6e671d2f151 100644 (file)
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -24,7 +24,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &mac0;

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index a72031407ebdb52519229af5bac9e448dd66ce4f..ebc3f2dbb6fd005482ab36fb1a8504a4d39de09f 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -19,7 +19,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                serial0 = &uart1;

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index e08c0c193767ba52ebfca54bb7e0a57e1c3a1172..bf343195697e8ccbfcbfe8ad0b2421c09d13015e 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -20,7 +20,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 35955e63d6c56d1781e6b41548df09a040067039..7954e79d0a169922cb8e64e21de80ef1820eda89 100644 (file)
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -25,7 +25,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 00d30bd700682a6ace4052efb948b5aeece63b53..5d390a64e976dae95d485e7df2688f0bd876c4dc 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -26,7 +26,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 1040251f29513ac239fcaeccf278f84685a0c6c9..7d647d043f528ab1194b0467a7552d34a3a7a9b7 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -26,7 +26,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 59ff86695a14caf21527b9b0c6e5db35ae3462de..0c70ea888d32ec9e824e3816bd2a54d0c46bc622 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -23,7 +23,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index ae8df3cf687e897d57ae0acc44e60e1861aaa80a..ab6a7e2e7e8f67680b7ec06e37989610ea9a450a 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -21,7 +21,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index aa29ca6561eef600500be96550ccd933cd8976f0..3d04201b599cc0bfb37bd1b04b055806fcaa79a2 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -22,7 +22,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                can0 = &flexcan1;

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index ba2d8a2774390420aeff70e47c7260f9bf336ee7..81c426e1b664f56c78c90b53b7878f8edb56d209 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -22,7 +22,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec1;

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 9aa2bb998552b78f3b9875ee570aec1496ba0fab..ec6292c5b2e475c89e44d243b701f3065ab441e0 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -58,7 +58,7 @@ / {
         * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; reg = <0 0>; };
+       memory { device_type = "memory"; };
 
        aliases {
                gpio0 = &gpio1;