summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiaxun Yang <jiaxun.yang@flygoat.com>2024-06-14 16:40:09 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-08-03 09:00:57 +0200
commit82016fa2f209af1497cee38950eab0514ceb7b75 (patch)
tree8549e55537981e3ee2471625f7683e6e1071fd54
parent519a900ad3e0bc9ca93e80ae3c6a6da411e4df37 (diff)
downloadlinux-stable-82016fa2f209af1497cee38950eab0514ceb7b75.tar.gz
linux-stable-82016fa2f209af1497cee38950eab0514ceb7b75.tar.bz2
linux-stable-82016fa2f209af1497cee38950eab0514ceb7b75.zip
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>
-rw-r--r--arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
index 46a280c552b4..c0be84a6e81f 100644
--- 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";