aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/ralink
diff options
context:
space:
mode:
authorAndrew Bresticker <abrestic@chromium.org>2014-08-21 16:04:26 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-09-22 07:35:50 -0400
commit011eeece0bb2e1b65b2d2fd618067425e8ccdbb4 (patch)
treea38ac1e63ad8f5972494c342af9ef05597bd668c /arch/mips/ralink
parent36094619e419c306dc08d83f043bc9937cc63e03 (diff)
MIPS: ralink: Move device-trees to arch/mips/boot/dts/
Move the Ralink device-trees to arch/mips/boot/dts/ and update the Makefiles accordingly. A built-in device-tree is optional, so select BUILTIN_DTB when it is requested. Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: James Hogan <james.hogan@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: David Daney <david.daney@cavium.com> Cc: John Crispin <blogic@openwrt.org> Cc: Jayachandran C <jchandra@broadcom.com> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7561/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ralink')
-rw-r--r--arch/mips/ralink/Kconfig4
-rw-r--r--arch/mips/ralink/Makefile2
-rw-r--r--arch/mips/ralink/dts/Makefile4
-rw-r--r--arch/mips/ralink/dts/mt7620a.dtsi58
-rw-r--r--arch/mips/ralink/dts/mt7620a_eval.dts17
-rw-r--r--arch/mips/ralink/dts/rt2880.dtsi58
-rw-r--r--arch/mips/ralink/dts/rt2880_eval.dts47
-rw-r--r--arch/mips/ralink/dts/rt3050.dtsi68
-rw-r--r--arch/mips/ralink/dts/rt3052_eval.dts51
-rw-r--r--arch/mips/ralink/dts/rt3883.dtsi58
-rw-r--r--arch/mips/ralink/dts/rt3883_eval.dts17
11 files changed, 4 insertions, 380 deletions
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 4a296655f446..77e8a9620e18 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -42,18 +42,22 @@ choice
42 config DTB_RT2880_EVAL 42 config DTB_RT2880_EVAL
43 bool "RT2880 eval kit" 43 bool "RT2880 eval kit"
44 depends on SOC_RT288X 44 depends on SOC_RT288X
45 select BUILTIN_DTB
45 46
46 config DTB_RT305X_EVAL 47 config DTB_RT305X_EVAL
47 bool "RT305x eval kit" 48 bool "RT305x eval kit"
48 depends on SOC_RT305X 49 depends on SOC_RT305X
50 select BUILTIN_DTB
49 51
50 config DTB_RT3883_EVAL 52 config DTB_RT3883_EVAL
51 bool "RT3883 eval kit" 53 bool "RT3883 eval kit"
52 depends on SOC_RT3883 54 depends on SOC_RT3883
55 select BUILTIN_DTB
53 56
54 config DTB_MT7620A_EVAL 57 config DTB_MT7620A_EVAL
55 bool "MT7620A eval kit" 58 bool "MT7620A eval kit"
56 depends on SOC_MT7620 59 depends on SOC_MT7620
60 select BUILTIN_DTB
57 61
58endchoice 62endchoice
59 63
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 98ae349827be..2c09c8aa0ae2 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -16,5 +16,3 @@ obj-$(CONFIG_SOC_RT3883) += rt3883.o
16obj-$(CONFIG_SOC_MT7620) += mt7620.o 16obj-$(CONFIG_SOC_MT7620) += mt7620.o
17 17
18obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 18obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
19
20obj-y += dts/
diff --git a/arch/mips/ralink/dts/Makefile b/arch/mips/ralink/dts/Makefile
deleted file mode 100644
index 18194fa93e80..000000000000
--- a/arch/mips/ralink/dts/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
1obj-$(CONFIG_DTB_RT2880_EVAL) := rt2880_eval.dtb.o
2obj-$(CONFIG_DTB_RT305X_EVAL) := rt3052_eval.dtb.o
3obj-$(CONFIG_DTB_RT3883_EVAL) := rt3883_eval.dtb.o
4obj-$(CONFIG_DTB_MT7620A_EVAL) := mt7620a_eval.dtb.o
diff --git a/arch/mips/ralink/dts/mt7620a.dtsi b/arch/mips/ralink/dts/mt7620a.dtsi
deleted file mode 100644
index 08bf24fefe9f..000000000000
--- a/arch/mips/ralink/dts/mt7620a.dtsi
+++ /dev/null
@@ -1,58 +0,0 @@
1/ {
2 #address-cells = <1>;
3 #size-cells = <1>;
4 compatible = "ralink,mtk7620a-soc";
5
6 cpus {
7 cpu@0 {
8 compatible = "mips,mips24KEc";
9 };
10 };
11
12 cpuintc: cpuintc@0 {
13 #address-cells = <0>;
14 #interrupt-cells = <1>;
15 interrupt-controller;
16 compatible = "mti,cpu-interrupt-controller";
17 };
18
19 palmbus@10000000 {
20 compatible = "palmbus";
21 reg = <0x10000000 0x200000>;
22 ranges = <0x0 0x10000000 0x1FFFFF>;
23
24 #address-cells = <1>;
25 #size-cells = <1>;
26
27 sysc@0 {
28 compatible = "ralink,mt7620a-sysc";
29 reg = <0x0 0x100>;
30 };
31
32 intc: intc@200 {
33 compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc";
34 reg = <0x200 0x100>;
35
36 interrupt-controller;
37 #interrupt-cells = <1>;
38
39 interrupt-parent = <&cpuintc>;
40 interrupts = <2>;
41 };
42
43 memc@300 {
44 compatible = "ralink,mt7620a-memc", "ralink,rt3050-memc";
45 reg = <0x300 0x100>;
46 };
47
48 uartlite@c00 {
49 compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
50 reg = <0xc00 0x100>;
51
52 interrupt-parent = <&intc>;
53 interrupts = <12>;
54
55 reg-shift = <2>;
56 };
57 };
58};
diff --git a/arch/mips/ralink/dts/mt7620a_eval.dts b/arch/mips/ralink/dts/mt7620a_eval.dts
deleted file mode 100644
index 709f58132f5c..000000000000
--- a/arch/mips/ralink/dts/mt7620a_eval.dts
+++ /dev/null
@@ -1,17 +0,0 @@
1/dts-v1/;
2
3/include/ "mt7620a.dtsi"
4
5/ {
6 compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
7 model = "Ralink MT7620A evaluation board";
8
9 memory@0 {
10 device_type = "memory";
11 reg = <0x0 0x2000000>;
12 };
13
14 chosen {
15 bootargs = "console=ttyS0,57600";
16 };
17};
diff --git a/arch/mips/ralink/dts/rt2880.dtsi b/arch/mips/ralink/dts/rt2880.dtsi
deleted file mode 100644
index 182afde2f2e1..000000000000
--- a/arch/mips/ralink/dts/rt2880.dtsi
+++ /dev/null
@@ -1,58 +0,0 @@
1/ {
2 #address-cells = <1>;
3 #size-cells = <1>;
4 compatible = "ralink,rt2880-soc";
5
6 cpus {
7 cpu@0 {
8 compatible = "mips,mips4KEc";
9 };
10 };
11
12 cpuintc: cpuintc@0 {
13 #address-cells = <0>;
14 #interrupt-cells = <1>;
15 interrupt-controller;
16 compatible = "mti,cpu-interrupt-controller";
17 };
18
19 palmbus@300000 {
20 compatible = "palmbus";
21 reg = <0x300000 0x200000>;
22 ranges = <0x0 0x300000 0x1FFFFF>;
23
24 #address-cells = <1>;
25 #size-cells = <1>;
26
27 sysc@0 {
28 compatible = "ralink,rt2880-sysc";
29 reg = <0x0 0x100>;
30 };
31
32 intc: intc@200 {
33 compatible = "ralink,rt2880-intc";
34 reg = <0x200 0x100>;
35
36 interrupt-controller;
37 #interrupt-cells = <1>;
38
39 interrupt-parent = <&cpuintc>;
40 interrupts = <2>;
41 };
42
43 memc@300 {
44 compatible = "ralink,rt2880-memc";
45 reg = <0x300 0x100>;
46 };
47
48 uartlite@c00 {
49 compatible = "ralink,rt2880-uart", "ns16550a";
50 reg = <0xc00 0x100>;
51
52 interrupt-parent = <&intc>;
53 interrupts = <8>;
54
55 reg-shift = <2>;
56 };
57 };
58};
diff --git a/arch/mips/ralink/dts/rt2880_eval.dts b/arch/mips/ralink/dts/rt2880_eval.dts
deleted file mode 100644
index 0a685db093d4..000000000000
--- a/arch/mips/ralink/dts/rt2880_eval.dts
+++ /dev/null
@@ -1,47 +0,0 @@
1/dts-v1/;
2
3/include/ "rt2880.dtsi"
4
5/ {
6 compatible = "ralink,rt2880-eval-board", "ralink,rt2880-soc";
7 model = "Ralink RT2880 evaluation board";
8
9 memory@0 {
10 device_type = "memory";
11 reg = <0x8000000 0x2000000>;
12 };
13
14 chosen {
15 bootargs = "console=ttyS0,57600";
16 };
17
18 cfi@1f000000 {
19 compatible = "cfi-flash";
20 reg = <0x1f000000 0x400000>;
21
22 bank-width = <2>;
23 device-width = <2>;
24 #address-cells = <1>;
25 #size-cells = <1>;
26
27 partition@0 {
28 label = "uboot";
29 reg = <0x0 0x30000>;
30 read-only;
31 };
32 partition@30000 {
33 label = "uboot-env";
34 reg = <0x30000 0x10000>;
35 read-only;
36 };
37 partition@40000 {
38 label = "calibration";
39 reg = <0x40000 0x10000>;
40 read-only;
41 };
42 partition@50000 {
43 label = "linux";
44 reg = <0x50000 0x3b0000>;
45 };
46 };
47};
diff --git a/arch/mips/ralink/dts/rt3050.dtsi b/arch/mips/ralink/dts/rt3050.dtsi
deleted file mode 100644
index e3203d414fee..000000000000
--- a/arch/mips/ralink/dts/rt3050.dtsi
+++ /dev/null
@@ -1,68 +0,0 @@
1/ {
2 #address-cells = <1>;
3 #size-cells = <1>;
4 compatible = "ralink,rt3050-soc", "ralink,rt3052-soc", "ralink,rt3350-soc";
5
6 cpus {
7 cpu@0 {
8 compatible = "mips,mips24KEc";
9 };
10 };
11
12 cpuintc: cpuintc@0 {
13 #address-cells = <0>;
14 #interrupt-cells = <1>;
15 interrupt-controller;
16 compatible = "mti,cpu-interrupt-controller";
17 };
18
19 palmbus@10000000 {
20 compatible = "palmbus";
21 reg = <0x10000000 0x200000>;
22 ranges = <0x0 0x10000000 0x1FFFFF>;
23
24 #address-cells = <1>;
25 #size-cells = <1>;
26
27 sysc@0 {
28 compatible = "ralink,rt3052-sysc", "ralink,rt3050-sysc";
29 reg = <0x0 0x100>;
30 };
31
32 intc: intc@200 {
33 compatible = "ralink,rt3052-intc", "ralink,rt2880-intc";
34 reg = <0x200 0x100>;
35
36 interrupt-controller;
37 #interrupt-cells = <1>;
38
39 interrupt-parent = <&cpuintc>;
40 interrupts = <2>;
41 };
42
43 memc@300 {
44 compatible = "ralink,rt3052-memc", "ralink,rt3050-memc";
45 reg = <0x300 0x100>;
46 };
47
48 uartlite@c00 {
49 compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a";
50 reg = <0xc00 0x100>;
51
52 interrupt-parent = <&intc>;
53 interrupts = <12>;
54
55 reg-shift = <2>;
56 };
57 };
58
59 usb@101c0000 {
60 compatible = "ralink,rt3050-usb", "snps,dwc2";
61 reg = <0x101c0000 40000>;
62
63 interrupt-parent = <&intc>;
64 interrupts = <18>;
65
66 status = "disabled";
67 };
68};
diff --git a/arch/mips/ralink/dts/rt3052_eval.dts b/arch/mips/ralink/dts/rt3052_eval.dts
deleted file mode 100644
index ec9e9a035541..000000000000
--- a/arch/mips/ralink/dts/rt3052_eval.dts
+++ /dev/null
@@ -1,51 +0,0 @@
1/dts-v1/;
2
3#include "rt3050.dtsi"
4
5/ {
6 compatible = "ralink,rt3052-eval-board", "ralink,rt3052-soc";
7 model = "Ralink RT3052 evaluation board";
8
9 memory@0 {
10 device_type = "memory";
11 reg = <0x0 0x2000000>;
12 };
13
14 chosen {
15 bootargs = "console=ttyS0,57600";
16 };
17
18 cfi@1f000000 {
19 compatible = "cfi-flash";
20 reg = <0x1f000000 0x800000>;
21
22 bank-width = <2>;
23 device-width = <2>;
24 #address-cells = <1>;
25 #size-cells = <1>;
26
27 partition@0 {
28 label = "uboot";
29 reg = <0x0 0x30000>;
30 read-only;
31 };
32 partition@30000 {
33 label = "uboot-env";
34 reg = <0x30000 0x10000>;
35 read-only;
36 };
37 partition@40000 {
38 label = "calibration";
39 reg = <0x40000 0x10000>;
40 read-only;
41 };
42 partition@50000 {
43 label = "linux";
44 reg = <0x50000 0x7b0000>;
45 };
46 };
47
48 usb@101c0000 {
49 status = "ok";
50 };
51};
diff --git a/arch/mips/ralink/dts/rt3883.dtsi b/arch/mips/ralink/dts/rt3883.dtsi
deleted file mode 100644
index 3b131dd0d5ac..000000000000
--- a/arch/mips/ralink/dts/rt3883.dtsi
+++ /dev/null
@@ -1,58 +0,0 @@
1/ {
2 #address-cells = <1>;
3 #size-cells = <1>;
4 compatible = "ralink,rt3883-soc";
5
6 cpus {
7 cpu@0 {
8 compatible = "mips,mips74Kc";
9 };
10 };
11
12 cpuintc: cpuintc@0 {
13 #address-cells = <0>;
14 #interrupt-cells = <1>;
15 interrupt-controller;
16 compatible = "mti,cpu-interrupt-controller";
17 };
18
19 palmbus@10000000 {
20 compatible = "palmbus";
21 reg = <0x10000000 0x200000>;
22 ranges = <0x0 0x10000000 0x1FFFFF>;
23
24 #address-cells = <1>;
25 #size-cells = <1>;
26
27 sysc@0 {
28 compatible = "ralink,rt3883-sysc", "ralink,rt3050-sysc";
29 reg = <0x0 0x100>;
30 };
31
32 intc: intc@200 {
33 compatible = "ralink,rt3883-intc", "ralink,rt2880-intc";
34 reg = <0x200 0x100>;
35
36 interrupt-controller;
37 #interrupt-cells = <1>;
38
39 interrupt-parent = <&cpuintc>;
40 interrupts = <2>;
41 };
42
43 memc@300 {
44 compatible = "ralink,rt3883-memc", "ralink,rt3050-memc";
45 reg = <0x300 0x100>;
46 };
47
48 uartlite@c00 {
49 compatible = "ralink,rt3883-uart", "ralink,rt2880-uart", "ns16550a";
50 reg = <0xc00 0x100>;
51
52 interrupt-parent = <&intc>;
53 interrupts = <12>;
54
55 reg-shift = <2>;
56 };
57 };
58};
diff --git a/arch/mips/ralink/dts/rt3883_eval.dts b/arch/mips/ralink/dts/rt3883_eval.dts
deleted file mode 100644
index e8df21a5d10d..000000000000
--- a/arch/mips/ralink/dts/rt3883_eval.dts
+++ /dev/null
@@ -1,17 +0,0 @@
1/dts-v1/;
2
3/include/ "rt3883.dtsi"
4
5/ {
6 compatible = "ralink,rt3883-eval-board", "ralink,rt3883-soc";
7 model = "Ralink RT3883 evaluation board";
8
9 memory@0 {
10 device_type = "memory";
11 reg = <0x0 0x2000000>;
12 };
13
14 chosen {
15 bootargs = "console=ttyS0,57600";
16 };
17};
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-04 23:11:51 -0500