summaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 14:24:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 14:24:36 -0700
commit857b50f5d0eed113428c864e927289d8f5f2b864 (patch)
tree6864b17f92b855d35f896b84948b8d19b0105ce4 /arch/mips/lantiq
parent168f07a1ea75870b3fdee3d69d978813eb1fd58d (diff)
parent31d6f57d3c65fd75c18ea9a3acebedc6cd60d656 (diff)
downloadlinux-857b50f5d0eed113428c864e927289d8f5f2b864.tar.bz2
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
config DT_EASY50712
bool "Easy50712"
depends on SOC_XWAY
+ select BUILTIN_DTB
endchoice
config 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 @@
obj-y := irq.o clk.o prom.o
-obj-y += dts/
-
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(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 @@
-obj-$(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 @@
-/ {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "lantiq,xway", "lantiq,danube";
-
- cpus {
- cpu@0 {
- compatible = "mips,mips24Kc";
- };
- };
-
- biu@1F800000 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "lantiq,biu", "simple-bus";
- reg = <0x1F800000 0x800000>;
- ranges = <0x0 0x1F800000 0x7FFFFF>;
-
- icu0: icu@80200 {
- #interrupt-cells = <1>;
- interrupt-controller;
- compatible = "lantiq,icu";
- reg = <0x80200 0x120>;
- };
-
- watchdog@803F0 {
- compatible = "lantiq,wdt";
- reg = <0x803F0 0x10>;
- };
- };
-
- sram@1F000000 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "lantiq,sram";
- reg = <0x1F000000 0x800000>;
- ranges = <0x0 0x1F000000 0x7FFFFF>;
-
- eiu0: eiu@101000 {
- #interrupt-cells = <1>;
- interrupt-controller;
- interrupt-parent;
- compatible = "lantiq,eiu-xway";
- reg = <0x101000 0x1000>;
- };
-
- pmu0: pmu@102000 {
- compatible = "lantiq,pmu-xway";
- reg = <0x102000 0x1000>;
- };
-
- cgu0: cgu@103000 {
- compatible = "lantiq,cgu-xway";
- reg = <0x103000 0x1000>;
- #clock-cells = <1>;
- };
-
- rcu0: rcu@203000 {
- compatible = "lantiq,rcu-xway";
- reg = <0x203000 0x1000>;
- };
- };
-
- fpi@10000000 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "lantiq,fpi", "simple-bus";
- ranges = <0x0 0x10000000 0xEEFFFFF>;
- reg = <0x10000000 0xEF00000>;
-
- gptu@E100A00 {
- compatible = "lantiq,gptu-xway";
- reg = <0xE100A00 0x100>;
- };
-
- serial@E100C00 {
- compatible = "lantiq,asc";
- reg = <0xE100C00 0x400>;
- interrupt-parent = <&icu0>;
- interrupts = <112 113 114>;
- };
-
- dma0: dma@E104100 {
- compatible = "lantiq,dma-xway";
- reg = <0xE104100 0x800>;
- };
-
- ebu0: ebu@E105300 {
- compatible = "lantiq,ebu-xway";
- reg = <0xE105300 0x100>;
- };
-
- pci0: pci@E105400 {
- #address-cells = <3>;
- #size-cells = <2>;
- #interrupt-cells = <1>;
- compatible = "lantiq,pci-xway";
- bus-range = <0x0 0x0>;
- ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000 /* pci memory */
- 0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
- reg = <0x7000000 0x8000 /* config space */
- 0xE105400 0x400>; /* pci bridge */
- };
- };
-};
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 @@
-/dts-v1/;
-
-/include/ "danube.dtsi"
-
-/ {
- chosen {
- bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
- };
-
- memory@0 {
- device_type = "memory";
- reg = <0x0 0x2000000>;
- };
-
- fpi@10000000 {
- #address-cells = <1>;
- #size-cells = <1>;
- localbus@0 {
- #address-cells = <2>;
- #size-cells = <1>;
- ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
- 1 0 0x4000000 0x4000010>; /* addsel1 */
- compatible = "lantiq,localbus", "simple-bus";
-
- nor-boot@0 {
- compatible = "lantiq,nor";
- bank-width = <2>;
- reg = <0 0x0 0x2000000>;
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "uboot";
- reg = <0x00000 0x10000>; /* 64 KB */
- };
-
- partition@10000 {
- label = "uboot_env";
- reg = <0x10000 0x10000>; /* 64 KB */
- };
-
- partition@20000 {
- label = "linux";
- reg = <0x20000 0x3d0000>;
- };
-
- partition@400000 {
- label = "rootfs";
- reg = <0x400000 0x400000>;
- };
- };
- };
-
- gpio: pinmux@E100B10 {
- compatible = "lantiq,pinctrl-xway";
- pinctrl-names = "default";
- pinctrl-0 = <&state_default>;
-
- #gpio-cells = <2>;
- gpio-controller;
- reg = <0xE100B10 0xA0>;
-
- state_default: pinmux {
- stp {
- lantiq,groups = "stp";
- lantiq,function = "stp";
- };
- exin {
- lantiq,groups = "exin1";
- lantiq,function = "exin";
- };
- pci {
- lantiq,groups = "gnt1";
- lantiq,function = "pci";
- };
- conf_out {
- lantiq,pins = "io4", "io5", "io6"; /* stp */
- lantiq,open-drain;
- lantiq,pull = <0>;
- };
- };
- };
-
- etop@E180000 {
- compatible = "lantiq,etop-xway";
- reg = <0xE180000 0x40000>;
- interrupt-parent = <&icu0>;
- interrupts = <73 78>;
- phy-mode = "rmii";
- mac-address = [ 00 11 22 33 44 55 ];
- };
-
- stp0: stp@E100BB0 {
- #gpio-cells = <2>;
- compatible = "lantiq,gpio-stp-xway";
- gpio-controller;
- reg = <0xE100BB0 0x40>;
-
- lantiq,shadow = <0xfff>;
- lantiq,groups = <0x3>;
- };
-
- pci@E105400 {
- lantiq,bus-clock = <33333333>;
- interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
- interrupt-map = <
- 0x7000 0 0 1 &icu0 29 1 // slot 14, irq 29
- >;
- gpios-reset = <&gpio 21 0>;
- req-mask = <0x1>; /* GNT1 */
- };
-
- };
-};