OSDN Git Service

MIPS: Loongson64: Add generic dts
authorJiaxun Yang <jiaxun.yang@flygoat.com>
Wed, 25 Mar 2020 03:55:02 +0000 (11:55 +0800)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Wed, 25 Mar 2020 15:07:12 +0000 (16:07 +0100)
Add generic device dts for Loongson-3 devices.
They are currently almost identical but will be different later.
Some PCH devices like PCI Host Bridge is still enabled by platform
code for now.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Co-developed-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/Kconfig
arch/mips/boot/dts/Makefile
arch/mips/boot/dts/loongson/Makefile [new file with mode: 0644]
arch/mips/boot/dts/loongson/loongson3-package.dtsi [new file with mode: 0644]
arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts [new file with mode: 0644]
arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts [new file with mode: 0644]
arch/mips/boot/dts/loongson/rs780e-pch.dtsi [new file with mode: 0644]

index ca3045b..4a0b2f4 100644 (file)
@@ -486,9 +486,11 @@ config MACH_LOONGSON64
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_ZBOOT
-       select LOONGSON_MC146818
        select ZONE_DMA32
        select NUMA
+       select COMMON_CLK
+       select USE_OF
+       select BUILTIN_DTB
        help
          This enables the support of Loongson-2/3 family of machines.
 
@@ -3081,7 +3083,7 @@ endchoice
 choice
        prompt "Kernel command line type" if !CMDLINE_OVERRIDE
        default MIPS_CMDLINE_FROM_DTB if USE_OF && !ATH79 && !MACH_INGENIC && \
-                                        !MIPS_MALTA && \
+                                        !MACH_LOONGSON64 && !MIPS_MALTA && \
                                         !CAVIUM_OCTEON_SOC
        default MIPS_CMDLINE_FROM_BOOTLOADER
 
index 1e79cab..d429a69 100644 (file)
@@ -4,6 +4,7 @@ subdir-y        += cavium-octeon
 subdir-y       += img
 subdir-y       += ingenic
 subdir-y       += lantiq
+subdir-y       += loongson
 subdir-y       += mscc
 subdir-y       += mti
 subdir-y       += netlogic
diff --git a/arch/mips/boot/dts/loongson/Makefile b/arch/mips/boot/dts/loongson/Makefile
new file mode 100644 (file)
index 0000000..56d3794
--- /dev/null
@@ -0,0 +1,4 @@
+# SPDX_License_Identifier: GPL_2.0
+dtb-$(CONFIG_MACH_LOONGSON64)  += loongson3_4core_rs780e.dtb loongson3_8core_rs780e.dtb
+
+obj-$(CONFIG_BUILTIN_DTB)      += $(addsuffix .o, $(dtb-y))
diff --git a/arch/mips/boot/dts/loongson/loongson3-package.dtsi b/arch/mips/boot/dts/loongson/loongson3-package.dtsi
new file mode 100644 (file)
index 0000000..5bb876a
--- /dev/null
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       cpuintc: interrupt-controller {
+               #address-cells = <0>;
+               #interrupt-cells = <1>;
+               interrupt-controller;
+               compatible = "mti,cpu-interrupt-controller";
+       };
+
+       package0: bus@1fe00000 {
+               compatible = "simple-bus";
+               #address-cells = <2>;
+               #size-cells = <1>;
+               ranges = <0 0x1fe00000 0 0x1fe00000 0x100000
+                       0 0x3ff00000 0 0x3ff00000 0x100000
+                       /* 3A HT Config Space */
+                       0xefd 0xfb000000 0xefd 0xfb000000 0x10000000
+                       /* 3B HT Config Space */
+                       0x1efd 0xfb000000 0x1efd 0xfb000000 0x10000000>;
+
+               liointc: interrupt-controller@3ff01400 {
+                       compatible = "loongson,liointc-1.0";
+                       reg = <0 0x3ff01400 0x64>;
+
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+
+                       interrupt-parent = <&cpuintc>;
+                       interrupts = <2>, <3>;
+                       interrupt-names = "int0", "int1";
+
+                       loongson,parent_int_map = <0xf0ffffff>, /* int0 */
+                                               <0x0f000000>, /* int1 */
+                                               <0x00000000>, /* int2 */
+                                               <0x00000000>; /* int3 */
+
+               };
+
+               cpu_uart0: serial@1fe001e0 {
+                       compatible = "ns16550a";
+                       reg = <0 0x1fe001e0 0x8>;
+                       clock-frequency = <33000000>;
+                       interrupt-parent = <&liointc>;
+                       interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
+                       no-loopback-test;
+               };
+
+               cpu_uart1: serial@1fe001e8 {
+                       status = "disabled";
+                       compatible = "ns16550a";
+                       reg = <0 0x1fe001e8 0x8>;
+                       clock-frequency = <33000000>;
+                       interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-parent = <&liointc>;
+                       no-loopback-test;
+               };
+       };
+};
diff --git a/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts b/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
new file mode 100644 (file)
index 0000000..6b5694c
--- /dev/null
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "loongson3-package.dtsi"
+#include "rs780e-pch.dtsi"
+
+/ {
+       compatible = "loongson,loongson3-4core-rs780e";
+};
+
+&package0 {
+       htpic: interrupt-controller@efdfb000080 {
+               compatible = "loongson,htpic-1.0";
+               reg = <0xefd 0xfb000080 0x40>;
+               interrupt-controller;
+               #interrupt-cells = <1>;
+
+               interrupt-parent = <&liointc>;
+               interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
+                               <25 IRQ_TYPE_LEVEL_HIGH>,
+                               <26 IRQ_TYPE_LEVEL_HIGH>,
+                               <27 IRQ_TYPE_LEVEL_HIGH>;
+       };
+};
diff --git a/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts b/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
new file mode 100644 (file)
index 0000000..ffefa2f
--- /dev/null
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "loongson3-package.dtsi"
+#include "rs780e-pch.dtsi"
+
+/ {
+       compatible = "loongson,loongson3-8core-rs780e";
+};
+
+&package0 {
+       htpic: interrupt-controller@1efdfb000080 {
+               compatible = "loongson,htpic-1.0";
+               reg = <0x1efd 0xfb000080 0x40>;
+               interrupt-controller;
+               #interrupt-cells = <1>;
+
+               interrupt-parent = <&liointc>;
+               interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
+                               <25 IRQ_TYPE_LEVEL_HIGH>,
+                               <26 IRQ_TYPE_LEVEL_HIGH>,
+                               <27 IRQ_TYPE_LEVEL_HIGH>;
+       };
+};
diff --git a/arch/mips/boot/dts/loongson/rs780e-pch.dtsi b/arch/mips/boot/dts/loongson/rs780e-pch.dtsi
new file mode 100644 (file)
index 0000000..45c54d5
--- /dev/null
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/ {
+       bus@10000000 {
+               compatible = "simple-bus";
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges = <0 0x10000000 0 0x10000000 0 0x10000000
+                               0 0x40000000 0 0x40000000 0 0x40000000
+                               0xfd 0xfe000000 0xfd 0xfe000000  0 0x2000000 /* PCI Config Space */>;
+
+               isa {
+                       compatible = "isa";
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+                       ranges = <1 0 0 0 0x1000>;
+
+                       rtc0: rtc@70 {
+                               compatible = "motorola,mc146818";
+                               reg = <1 0x70 0x8>;
+                               interrupts = <8>;
+                               interrupt-parent = <&htpic>;
+                       };
+               };
+       };
+};