MIPS: Loongson64: Remove memory node for builtin-dtb

commit b81656c37acf1e682dde02f3e07987784b0f3634 upstream.

Builtin DTBS should never contain memory node as memory is
going to be managed by LEFI interface.

Remove memory node to prevent confliction.

Fixes: b1a792601f26 ("MIPS: Loongson64: DeviceTree for Loongson-2K1000")
Cc: stable@vger.kernel.org
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
index 46a280c552b4e25498049222fe315f4142aeaec3..c0be84a6e81fdd2ff206d5facfbc4c8ac1a49925 100644 (file)
--- a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
+++ b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
@@ -23,14 +23,6 @@
                };
        };
 
-       memory@200000 {
-               compatible = "memory";
-               device_type = "memory";
-               reg = <0x00000000 0x00200000 0x00000000 0x0ee00000>, /* 238 MB at 2 MB */
-                       <0x00000000 0x20000000 0x00000000 0x1f000000>, /* 496 MB at 512 MB */
-                       <0x00000001 0x10000000 0x00000001 0xb0000000>; /* 6912 MB at 4352MB */
-       };
-
        cpu_clk: cpu_clk {
                #clock-cells = <0>;
                compatible = "fixed-clock";