aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 17:24:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 17:24:36 -0400
commit857b50f5d0eed113428c864e927289d8f5f2b864 (patch)
tree6864b17f92b855d35f896b84948b8d19b0105ce4 /arch/mips/lantiq
parent168f07a1ea75870b3fdee3d69d978813eb1fd58d (diff)
parent31d6f57d3c65fd75c18ea9a3acebedc6cd60d656 (diff)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle: "This is the MIPS pull request for the next kernel: - Zubair's patch series adds CMA support for MIPS. Doing so it also touches ARM64 and x86. - remove the last instance of IRQF_DISABLED from arch/mips - updates to two of the MIPS defconfig files. - cleanup of how cache coherency bits are handled on MIPS and implement support for write-combining. - platform upgrades for Alchemy - move MIPS DTS files to arch/mips/boot/dts/" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (24 commits) MIPS: ralink: remove deprecated IRQF_DISABLED MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS MIPS: cpu-probe: Set the write-combine CCA value on per core basis MIPS: pgtable-bits: Define the CCA bit for WC writes on Ingenic cores MIPS: pgtable-bits: Move the CCA bits out of the core's ifdef blocks MIPS: DMA: Add cma support x86: use generic dma-contiguous.h arm64: use generic dma-contiguous.h asm-generic: Add dma-contiguous.h MIPS: BPF: Add new emit_long_instr macro MIPS: ralink: Move device-trees to arch/mips/boot/dts/ MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/ MIPS: sead3: Move device-trees to arch/mips/boot/dts/ MIPS: Lantiq: Move device-trees to arch/mips/boot/dts/ MIPS: Octeon: Move device-trees to arch/mips/boot/dts/ MIPS: Add support for building device-tree binaries MIPS: Create common infrastructure for building built-in device-trees MIPS: SEAD3: Enable DEVTMPFS MIPS: SEAD3: Regenerate defconfigs MIPS: Alchemy: DB1300: Add touch penirq support ...
Diffstat (limited to 'arch/mips/lantiq')
-rw-r--r--arch/mips/lantiq/Kconfig1
-rw-r--r--arch/mips/lantiq/Makefile2
-rw-r--r--arch/mips/lantiq/dts/Makefile1
-rw-r--r--arch/mips/lantiq/dts/danube.dtsi105
-rw-r--r--arch/mips/lantiq/dts/easy50712.dts114
5 files changed, 1 insertions, 222 deletions
diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig
index c0021912131e..e10d33342b30 100644
--- a/arch/mips/lantiq/Kconfig
+++ b/arch/mips/lantiq/Kconfig
@@ -30,6 +30,7 @@ choice
30config DT_EASY50712 30config DT_EASY50712
31 bool "Easy50712" 31 bool "Easy50712"
32 depends on SOC_XWAY 32 depends on SOC_XWAY
33 select BUILTIN_DTB
33endchoice 34endchoice
34 35
35config PCI_LANTIQ 36config PCI_LANTIQ
diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile
index d6bdc579419f..690257ab86d6 100644
--- a/arch/mips/lantiq/Makefile
+++ b/arch/mips/lantiq/Makefile
@@ -6,8 +6,6 @@
6 6
7obj-y := irq.o clk.o prom.o 7obj-y := irq.o clk.o prom.o
8 8
9obj-y += dts/
10
11obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 9obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
12 10
13obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ 11obj-$(CONFIG_SOC_TYPE_XWAY) += xway/
diff --git a/arch/mips/lantiq/dts/Makefile b/arch/mips/lantiq/dts/Makefile
deleted file mode 100644
index 6fa72dd641b2..000000000000
--- a/arch/mips/lantiq/dts/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-$(CONFIG_DT_EASY50712) := easy50712.dtb.o
diff --git a/arch/mips/lantiq/dts/danube.dtsi b/arch/mips/lantiq/dts/danube.dtsi
deleted file mode 100644
index d4c59e003708..000000000000
--- a/arch/mips/lantiq/dts/danube.dtsi
+++ /dev/null
@@ -1,105 +0,0 @@
1/ {
2 #address-cells = <1>;
3 #size-cells = <1>;
4 compatible = "lantiq,xway", "lantiq,danube";
5
6 cpus {
7 cpu@0 {
8 compatible = "mips,mips24Kc";
9 };
10 };
11
12 biu@1F800000 {
13 #address-cells = <1>;
14 #size-cells = <1>;
15 compatible = "lantiq,biu", "simple-bus";
16 reg = <0x1F800000 0x800000>;
17 ranges = <0x0 0x1F800000 0x7FFFFF>;
18
19 icu0: icu@80200 {
20 #interrupt-cells = <1>;
21 interrupt-controller;
22 compatible = "lantiq,icu";
23 reg = <0x80200 0x120>;
24 };
25
26 watchdog@803F0 {
27 compatible = "lantiq,wdt";
28 reg = <0x803F0 0x10>;
29 };
30 };
31
32 sram@1F000000 {
33 #address-cells = <1>;
34 #size-cells = <1>;
35 compatible = "lantiq,sram";
36 reg = <0x1F000000 0x800000>;
37 ranges = <0x0 0x1F000000 0x7FFFFF>;
38
39 eiu0: eiu@101000 {
40 #interrupt-cells = <1>;
41 interrupt-controller;
42 interrupt-parent;
43 compatible = "lantiq,eiu-xway";
44 reg = <0x101000 0x1000>;
45 };
46
47 pmu0: pmu@102000 {
48 compatible = "lantiq,pmu-xway";
49 reg = <0x102000 0x1000>;
50 };
51
52 cgu0: cgu@103000 {
53 compatible = "lantiq,cgu-xway";
54 reg = <0x103000 0x1000>;
55 #clock-cells = <1>;
56 };
57
58 rcu0: rcu@203000 {
59 compatible = "lantiq,rcu-xway";
60 reg = <0x203000 0x1000>;
61 };
62 };
63
64 fpi@10000000 {
65 #address-cells = <1>;
66 #size-cells = <1>;
67 compatible = "lantiq,fpi", "simple-bus";
68 ranges = <0x0 0x10000000 0xEEFFFFF>;
69 reg = <0x10000000 0xEF00000>;
70
71 gptu@E100A00 {
72 compatible = "lantiq,gptu-xway";
73 reg = <0xE100A00 0x100>;
74 };
75
76 serial@E100C00 {
77 compatible = "lantiq,asc";
78 reg = <0xE100C00 0x400>;
79 interrupt-parent = <&icu0>;
80 interrupts = <112 113 114>;
81 };
82
83 dma0: dma@E104100 {
84 compatible = "lantiq,dma-xway";
85 reg = <0xE104100 0x800>;
86 };
87
88 ebu0: ebu@E105300 {
89 compatible = "lantiq,ebu-xway";
90 reg = <0xE105300 0x100>;
91 };
92
93 pci0: pci@E105400 {
94 #address-cells = <3>;
95 #size-cells = <2>;
96 #interrupt-cells = <1>;
97 compatible = "lantiq,pci-xway";
98 bus-range = <0x0 0x0>;
99 ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000 /* pci memory */
100 0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
101 reg = <0x7000000 0x8000 /* config space */
102 0xE105400 0x400>; /* pci bridge */
103 };
104 };
105};
diff --git a/arch/mips/lantiq/dts/easy50712.dts b/arch/mips/lantiq/dts/easy50712.dts
deleted file mode 100644
index 143b8a37b5e4..000000000000
--- a/arch/mips/lantiq/dts/easy50712.dts
+++ /dev/null
@@ -1,114 +0,0 @@
1/dts-v1/;
2
3/include/ "danube.dtsi"
4
5/ {
6 chosen {
7 bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
8 };
9
10 memory@0 {
11 device_type = "memory";
12 reg = <0x0 0x2000000>;
13 };
14
15 fpi@10000000 {
16 #address-cells = <1>;
17 #size-cells = <1>;
18 localbus@0 {
19 #address-cells = <2>;
20 #size-cells = <1>;
21 ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
22 1 0 0x4000000 0x4000010>; /* addsel1 */
23 compatible = "lantiq,localbus", "simple-bus";
24
25 nor-boot@0 {
26 compatible = "lantiq,nor";
27 bank-width = <2>;
28 reg = <0 0x0 0x2000000>;
29 #address-cells = <1>;
30 #size-cells = <1>;
31
32 partition@0 {
33 label = "uboot";
34 reg = <0x00000 0x10000>; /* 64 KB */
35 };
36
37 partition@10000 {
38 label = "uboot_env";
39 reg = <0x10000 0x10000>; /* 64 KB */
40 };
41
42 partition@20000 {
43 label = "linux";
44 reg = <0x20000 0x3d0000>;
45 };
46
47 partition@400000 {
48 label = "rootfs";
49 reg = <0x400000 0x400000>;
50 };
51 };
52 };
53
54 gpio: pinmux@E100B10 {
55 compatible = "lantiq,pinctrl-xway";
56 pinctrl-names = "default";
57 pinctrl-0 = <&state_default>;
58
59 #gpio-cells = <2>;
60 gpio-controller;
61 reg = <0xE100B10 0xA0>;
62
63 state_default: pinmux {
64 stp {
65 lantiq,groups = "stp";
66 lantiq,function = "stp";
67 };
68 exin {
69 lantiq,groups = "exin1";
70 lantiq,function = "exin";
71 };
72 pci {
73 lantiq,groups = "gnt1";
74 lantiq,function = "pci";
75 };
76 conf_out {
77 lantiq,pins = "io4", "io5", "io6"; /* stp */
78 lantiq,open-drain;
79 lantiq,pull = <0>;
80 };
81 };
82 };
83
84 etop@E180000 {
85 compatible = "lantiq,etop-xway";
86 reg = <0xE180000 0x40000>;
87 interrupt-parent = <&icu0>;
88 interrupts = <73 78>;
89 phy-mode = "rmii";
90 mac-address = [ 00 11 22 33 44 55 ];
91 };
92
93 stp0: stp@E100BB0 {
94 #gpio-cells = <2>;
95 compatible = "lantiq,gpio-stp-xway";
96 gpio-controller;
97 reg = <0xE100BB0 0x40>;
98
99 lantiq,shadow = <0xfff>;
100 lantiq,groups = <0x3>;
101 };
102
103 pci@E105400 {
104 lantiq,bus-clock = <33333333>;
105 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
106 interrupt-map = <
107 0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
108 >;
109 gpios-reset = <&gpio 21 0>;
110 req-mask = <0x1>; /* GNT1 */
111 };
112
113 };
114};
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-23 16:24:41 -0500