MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/

Move the Netlogic XLP 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/7560/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index 8df3d3ef0a85a17affbbac27afb624c0ef58cb56..1638a3837caad86fdcf1a631a814e17101da0515 100644 (file)
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,5 +1,9 @@
 dtb-$(CONFIG_CAVIUM_OCTEON_SOC)                += octeon_3xxx.dtb octeon_68xx.dtb
 dtb-$(CONFIG_DT_EASY50712)             += easy50712.dtb
+dtb-$(CONFIG_DT_XLP_EVP)               += xlp_evp.dtb
+dtb-$(CONFIG_DT_XLP_SVP)               += xlp_svp.dtb
+dtb-$(CONFIG_DT_XLP_FVP)               += xlp_fvp.dtb
+dtb-$(CONFIG_DT_XLP_GVP)               += xlp_gvp.dtb
 dtb-$(CONFIG_MIPS_SEAD3)               += sead3.dtb
 
 obj-y          += $(patsubst %.dtb, %.dtb.o, $(dtb-y))

diff --git a/arch/mips/boot/dts/xlp_evp.dts b/arch/mips/boot/dts/xlp_evp.dts
new file mode 100644 (file)
index 0000000..89ad048
--- /dev/null
+++ b/arch/mips/boot/dts/xlp_evp.dts
@@ -0,0 +1,118 @@
+/*
+ * XLP8XX Device Tree Source for EVP boards
+ */
+
+/dts-v1/;
+/ {
+       model = "netlogic,XLP-EVP";
+       compatible = "netlogic,xlp";
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       soc {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               compatible = "simple-bus";
+               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
+
+               serial0: serial@30000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x30100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <133333333>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <17>;
+               };
+               serial1: serial@31000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x31100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <133333333>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <18>;
+               };
+               i2c0: ocores@32000 {
+                       compatible = "opencores,i2c-ocores";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0 0x32100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <32000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <30>;
+               };
+               i2c1: ocores@33000 {
+                       compatible = "opencores,i2c-ocores";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0 0x33100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <32000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <31>;
+
+                       rtc@68 {
+                               compatible = "dallas,ds1374";
+                               reg = <0x68>;
+                       };
+
+                       dtt@4c {
+                               compatible = "national,lm90";
+                               reg = <0x4c>;
+                       };
+               };
+               pic: pic@4000 {
+                       compatible = "netlogic,xlp-pic";
+                       #address-cells = <0>;
+                       #interrupt-cells = <1>;
+                       reg = <0 0x4000 0x200>;
+                       interrupt-controller;
+               };
+
+               nor_flash@1,0 {
+                       compatible = "cfi-flash";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       bank-width = <2>;
+                       reg = <1 0 0x1000000>;
+
+                       partition@0 {
+                               label = "x-loader";
+                               reg = <0x0 0x100000>; /* 1M */
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "u-boot";
+                               reg = <0x100000 0x100000>; /* 1M */
+                       };
+
+                       partition@200000 {
+                               label = "kernel";
+                               reg = <0x200000 0x500000>; /* 5M */
+                       };
+
+                       partition@700000 {
+                               label = "rootfs";
+                               reg = <0x700000 0x800000>; /* 8M */
+                       };
+
+                       partition@f00000 {
+                               label = "env";
+                               reg = <0xf00000 0x100000>; /* 1M */
+                               read-only;
+                       };
+               };
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
+       };
+};

diff --git a/arch/mips/boot/dts/xlp_fvp.dts b/arch/mips/boot/dts/xlp_fvp.dts
new file mode 100644 (file)
index 0000000..63e62b7
--- /dev/null
+++ b/arch/mips/boot/dts/xlp_fvp.dts
@@ -0,0 +1,118 @@
+/*
+ * XLP2XX Device Tree Source for FVP boards
+ */
+
+/dts-v1/;
+/ {
+       model = "netlogic,XLP-FVP";
+       compatible = "netlogic,xlp";
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       soc {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               compatible = "simple-bus";
+               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
+
+               serial0: serial@30000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x30100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <133333333>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <17>;
+               };
+               serial1: serial@31000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x31100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <133333333>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <18>;
+               };
+               i2c0: ocores@37100 {
+                       compatible = "opencores,i2c-ocores";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0 0x37100 0x20>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <32000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <30>;
+               };
+               i2c1: ocores@37120 {
+                       compatible = "opencores,i2c-ocores";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0 0x37120 0x20>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <32000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <31>;
+
+                       rtc@68 {
+                               compatible = "dallas,ds1374";
+                               reg = <0x68>;
+                       };
+
+                       dtt@4c {
+                               compatible = "national,lm90";
+                               reg = <0x4c>;
+                       };
+               };
+               pic: pic@4000 {
+                       compatible = "netlogic,xlp-pic";
+                       #address-cells = <0>;
+                       #interrupt-cells = <1>;
+                       reg = <0 0x4000 0x200>;
+                       interrupt-controller;
+               };
+
+               nor_flash@1,0 {
+                       compatible = "cfi-flash";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       bank-width = <2>;
+                       reg = <1 0 0x1000000>;
+
+                       partition@0 {
+                               label = "x-loader";
+                               reg = <0x0 0x100000>; /* 1M */
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "u-boot";
+                               reg = <0x100000 0x100000>; /* 1M */
+                       };
+
+                       partition@200000 {
+                               label = "kernel";
+                               reg = <0x200000 0x500000>; /* 5M */
+                       };
+
+                       partition@700000 {
+                               label = "rootfs";
+                               reg = <0x700000 0x800000>; /* 8M */
+                       };
+
+                       partition@f00000 {
+                               label = "env";
+                               reg = <0xf00000 0x100000>; /* 1M */
+                               read-only;
+                       };
+               };
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
+       };
+};

diff --git a/arch/mips/boot/dts/xlp_gvp.dts b/arch/mips/boot/dts/xlp_gvp.dts
new file mode 100644 (file)
index 0000000..bb4ecd1
--- /dev/null
+++ b/arch/mips/boot/dts/xlp_gvp.dts
@@ -0,0 +1,77 @@
+/*
+ * XLP9XX Device Tree Source for GVP boards
+ */
+
+/dts-v1/;
+/ {
+       model = "netlogic,XLP-GVP";
+       compatible = "netlogic,xlp";
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       soc {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               compatible = "simple-bus";
+               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
+
+               serial0: serial@30000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x112100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <125000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <17>;
+               };
+               pic: pic@110000 {
+                       compatible = "netlogic,xlp-pic";
+                       #address-cells = <0>;
+                       #interrupt-cells = <1>;
+                       reg = <0 0x110000 0x200>;
+                       interrupt-controller;
+               };
+
+               nor_flash@1,0 {
+                       compatible = "cfi-flash";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       bank-width = <2>;
+                       reg = <1 0 0x1000000>;
+
+                       partition@0 {
+                               label = "x-loader";
+                               reg = <0x0 0x100000>; /* 1M */
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "u-boot";
+                               reg = <0x100000 0x100000>; /* 1M */
+                       };
+
+                       partition@200000 {
+                               label = "kernel";
+                               reg = <0x200000 0x500000>; /* 5M */
+                       };
+
+                       partition@700000 {
+                               label = "rootfs";
+                               reg = <0x700000 0x800000>; /* 8M */
+                       };
+
+                       partition@f00000 {
+                               label = "env";
+                               reg = <0xf00000 0x100000>; /* 1M */
+                               read-only;
+                       };
+               };
+
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
+       };
+};

diff --git a/arch/mips/boot/dts/xlp_svp.dts b/arch/mips/boot/dts/xlp_svp.dts
new file mode 100644 (file)
index 0000000..1ebd00e
--- /dev/null
+++ b/arch/mips/boot/dts/xlp_svp.dts
@@ -0,0 +1,118 @@
+/*
+ * XLP3XX Device Tree Source for SVP boards
+ */
+
+/dts-v1/;
+/ {
+       model = "netlogic,XLP-SVP";
+       compatible = "netlogic,xlp";
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       soc {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               compatible = "simple-bus";
+               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
+
+               serial0: serial@30000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x30100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <133333333>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <17>;
+               };
+               serial1: serial@31000 {
+                       device_type = "serial";
+                       compatible = "ns16550";
+                       reg = <0 0x31100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <133333333>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <18>;
+               };
+               i2c0: ocores@32000 {
+                       compatible = "opencores,i2c-ocores";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0 0x32100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <32000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <30>;
+               };
+               i2c1: ocores@33000 {
+                       compatible = "opencores,i2c-ocores";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0 0x33100 0xa00>;
+                       reg-shift = <2>;
+                       reg-io-width = <4>;
+                       clock-frequency = <32000000>;
+                       interrupt-parent = <&pic>;
+                       interrupts = <31>;
+
+                       rtc@68 {
+                               compatible = "dallas,ds1374";
+                               reg = <0x68>;
+                       };
+
+                       dtt@4c {
+                               compatible = "national,lm90";
+                               reg = <0x4c>;
+                       };
+               };
+               pic: pic@4000 {
+                       compatible = "netlogic,xlp-pic";
+                       #address-cells = <0>;
+                       #interrupt-cells = <1>;
+                       reg = <0 0x4000 0x200>;
+                       interrupt-controller;
+               };
+
+               nor_flash@1,0 {
+                       compatible = "cfi-flash";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       bank-width = <2>;
+                       reg = <1 0 0x1000000>;
+
+                       partition@0 {
+                               label = "x-loader";
+                               reg = <0x0 0x100000>; /* 1M */
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "u-boot";
+                               reg = <0x100000 0x100000>; /* 1M */
+                       };
+
+                       partition@200000 {
+                               label = "kernel";
+                               reg = <0x200000 0x500000>; /* 5M */
+                       };
+
+                       partition@700000 {
+                               label = "rootfs";
+                               reg = <0x700000 0x800000>; /* 8M */
+                       };
+
+                       partition@f00000 {
+                               label = "env";
+                               reg = <0xf00000 0x100000>; /* 1M */
+                               read-only;
+                       };
+               };
+       };
+
+       chosen {
+               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
+       };
+};

diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 4eb683aef7d7669bf86cae46a45b5c352fbfab39..0823321c10e0744be05d11236b2ac47f2e5e275e 100644 (file)
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -4,6 +4,7 @@ if NLM_XLP_BOARD
 config DT_XLP_EVP
        bool "Built-in device tree for XLP EVP boards"
        default y
+       select BUILTIN_DTB
        help
          Add an FDT blob for XLP EVP boards into the kernel.
          This DTB will be used if the firmware does not pass in a DTB
@@ -13,6 +14,7 @@ config DT_XLP_EVP
 config DT_XLP_SVP
        bool "Built-in device tree for XLP SVP boards"
        default y
+       select BUILTIN_DTB
        help
          Add an FDT blob for XLP VP boards into the kernel.
          This DTB will be used if the firmware does not pass in a DTB
@@ -22,6 +24,7 @@ config DT_XLP_SVP
 config DT_XLP_FVP
        bool "Built-in device tree for XLP FVP boards"
        default y
+       select BUILTIN_DTB
        help
          Add an FDT blob for XLP FVP board into the kernel.
          This DTB will be used if the firmware does not pass in a DTB
@@ -31,6 +34,7 @@ config DT_XLP_FVP
 config DT_XLP_GVP
        bool "Built-in device tree for XLP GVP boards"
        default y
+       select BUILTIN_DTB
        help
          Add an FDT blob for XLP GVP board into the kernel.
          This DTB will be used if the firmware does not pass in a DTB

diff --git a/arch/mips/netlogic/Makefile b/arch/mips/netlogic/Makefile
index 7602d1386614ee2d384b421c9b415a093667cf85..36d169b2ca6d34f7185c491746c2e773206c301d 100644 (file)
--- a/arch/mips/netlogic/Makefile
+++ b/arch/mips/netlogic/Makefile
@@ -1,4 +1,3 @@
 obj-$(CONFIG_NLM_COMMON)       +=      common/
 obj-$(CONFIG_CPU_XLR)          +=      xlr/
 obj-$(CONFIG_CPU_XLP)          +=      xlp/
-obj-$(CONFIG_CPU_XLP)          +=      dts/

diff --git a/arch/mips/netlogic/dts/Makefile b/arch/mips/netlogic/dts/Makefile
deleted file mode 100644 (file)
index 25c8e87..0000000
--- a/arch/mips/netlogic/dts/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o
-obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o
-obj-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb.o
-obj-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb.o

diff --git a/arch/mips/netlogic/dts/xlp_evp.dts b/arch/mips/netlogic/dts/xlp_evp.dts
deleted file mode 100644 (file)
index 89ad048..0000000
--- a/arch/mips/netlogic/dts/xlp_evp.dts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * XLP8XX Device Tree Source for EVP boards
- */
-
-/dts-v1/;
-/ {
-       model = "netlogic,XLP-EVP";
-       compatible = "netlogic,xlp";
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       soc {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               compatible = "simple-bus";
-               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
-                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
-
-               serial0: serial@30000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x30100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <133333333>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <17>;
-               };
-               serial1: serial@31000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x31100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <133333333>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <18>;
-               };
-               i2c0: ocores@32000 {
-                       compatible = "opencores,i2c-ocores";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0x32100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <32000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <30>;
-               };
-               i2c1: ocores@33000 {
-                       compatible = "opencores,i2c-ocores";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0x33100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <32000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <31>;
-
-                       rtc@68 {
-                               compatible = "dallas,ds1374";
-                               reg = <0x68>;
-                       };
-
-                       dtt@4c {
-                               compatible = "national,lm90";
-                               reg = <0x4c>;
-                       };
-               };
-               pic: pic@4000 {
-                       compatible = "netlogic,xlp-pic";
-                       #address-cells = <0>;
-                       #interrupt-cells = <1>;
-                       reg = <0 0x4000 0x200>;
-                       interrupt-controller;
-               };
-
-               nor_flash@1,0 {
-                       compatible = "cfi-flash";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       bank-width = <2>;
-                       reg = <1 0 0x1000000>;
-
-                       partition@0 {
-                               label = "x-loader";
-                               reg = <0x0 0x100000>; /* 1M */
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "u-boot";
-                               reg = <0x100000 0x100000>; /* 1M */
-                       };
-
-                       partition@200000 {
-                               label = "kernel";
-                               reg = <0x200000 0x500000>; /* 5M */
-                       };
-
-                       partition@700000 {
-                               label = "rootfs";
-                               reg = <0x700000 0x800000>; /* 8M */
-                       };
-
-                       partition@f00000 {
-                               label = "env";
-                               reg = <0xf00000 0x100000>; /* 1M */
-                               read-only;
-                       };
-               };
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
-       };
-};

diff --git a/arch/mips/netlogic/dts/xlp_fvp.dts b/arch/mips/netlogic/dts/xlp_fvp.dts
deleted file mode 100644 (file)
index 63e62b7..0000000
--- a/arch/mips/netlogic/dts/xlp_fvp.dts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * XLP2XX Device Tree Source for FVP boards
- */
-
-/dts-v1/;
-/ {
-       model = "netlogic,XLP-FVP";
-       compatible = "netlogic,xlp";
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       soc {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               compatible = "simple-bus";
-               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
-                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
-
-               serial0: serial@30000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x30100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <133333333>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <17>;
-               };
-               serial1: serial@31000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x31100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <133333333>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <18>;
-               };
-               i2c0: ocores@37100 {
-                       compatible = "opencores,i2c-ocores";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0x37100 0x20>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <32000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <30>;
-               };
-               i2c1: ocores@37120 {
-                       compatible = "opencores,i2c-ocores";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0x37120 0x20>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <32000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <31>;
-
-                       rtc@68 {
-                               compatible = "dallas,ds1374";
-                               reg = <0x68>;
-                       };
-
-                       dtt@4c {
-                               compatible = "national,lm90";
-                               reg = <0x4c>;
-                       };
-               };
-               pic: pic@4000 {
-                       compatible = "netlogic,xlp-pic";
-                       #address-cells = <0>;
-                       #interrupt-cells = <1>;
-                       reg = <0 0x4000 0x200>;
-                       interrupt-controller;
-               };
-
-               nor_flash@1,0 {
-                       compatible = "cfi-flash";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       bank-width = <2>;
-                       reg = <1 0 0x1000000>;
-
-                       partition@0 {
-                               label = "x-loader";
-                               reg = <0x0 0x100000>; /* 1M */
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "u-boot";
-                               reg = <0x100000 0x100000>; /* 1M */
-                       };
-
-                       partition@200000 {
-                               label = "kernel";
-                               reg = <0x200000 0x500000>; /* 5M */
-                       };
-
-                       partition@700000 {
-                               label = "rootfs";
-                               reg = <0x700000 0x800000>; /* 8M */
-                       };
-
-                       partition@f00000 {
-                               label = "env";
-                               reg = <0xf00000 0x100000>; /* 1M */
-                               read-only;
-                       };
-               };
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
-       };
-};

diff --git a/arch/mips/netlogic/dts/xlp_gvp.dts b/arch/mips/netlogic/dts/xlp_gvp.dts
deleted file mode 100644 (file)
index bb4ecd1..0000000
--- a/arch/mips/netlogic/dts/xlp_gvp.dts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * XLP9XX Device Tree Source for GVP boards
- */
-
-/dts-v1/;
-/ {
-       model = "netlogic,XLP-GVP";
-       compatible = "netlogic,xlp";
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       soc {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               compatible = "simple-bus";
-               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
-                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
-
-               serial0: serial@30000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x112100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <125000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <17>;
-               };
-               pic: pic@110000 {
-                       compatible = "netlogic,xlp-pic";
-                       #address-cells = <0>;
-                       #interrupt-cells = <1>;
-                       reg = <0 0x110000 0x200>;
-                       interrupt-controller;
-               };
-
-               nor_flash@1,0 {
-                       compatible = "cfi-flash";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       bank-width = <2>;
-                       reg = <1 0 0x1000000>;
-
-                       partition@0 {
-                               label = "x-loader";
-                               reg = <0x0 0x100000>; /* 1M */
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "u-boot";
-                               reg = <0x100000 0x100000>; /* 1M */
-                       };
-
-                       partition@200000 {
-                               label = "kernel";
-                               reg = <0x200000 0x500000>; /* 5M */
-                       };
-
-                       partition@700000 {
-                               label = "rootfs";
-                               reg = <0x700000 0x800000>; /* 8M */
-                       };
-
-                       partition@f00000 {
-                               label = "env";
-                               reg = <0xf00000 0x100000>; /* 1M */
-                               read-only;
-                       };
-               };
-
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
-       };
-};

diff --git a/arch/mips/netlogic/dts/xlp_svp.dts b/arch/mips/netlogic/dts/xlp_svp.dts
deleted file mode 100644 (file)
index 1ebd00e..0000000
--- a/arch/mips/netlogic/dts/xlp_svp.dts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * XLP3XX Device Tree Source for SVP boards
- */
-
-/dts-v1/;
-/ {
-       model = "netlogic,XLP-SVP";
-       compatible = "netlogic,xlp";
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       soc {
-               #address-cells = <2>;
-               #size-cells = <1>;
-               compatible = "simple-bus";
-               ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
-                         1 0  0 0x16000000  0x02000000>; // GBU chipselects
-
-               serial0: serial@30000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x30100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <133333333>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <17>;
-               };
-               serial1: serial@31000 {
-                       device_type = "serial";
-                       compatible = "ns16550";
-                       reg = <0 0x31100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <133333333>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <18>;
-               };
-               i2c0: ocores@32000 {
-                       compatible = "opencores,i2c-ocores";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0x32100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <32000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <30>;
-               };
-               i2c1: ocores@33000 {
-                       compatible = "opencores,i2c-ocores";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0 0x33100 0xa00>;
-                       reg-shift = <2>;
-                       reg-io-width = <4>;
-                       clock-frequency = <32000000>;
-                       interrupt-parent = <&pic>;
-                       interrupts = <31>;
-
-                       rtc@68 {
-                               compatible = "dallas,ds1374";
-                               reg = <0x68>;
-                       };
-
-                       dtt@4c {
-                               compatible = "national,lm90";
-                               reg = <0x4c>;
-                       };
-               };
-               pic: pic@4000 {
-                       compatible = "netlogic,xlp-pic";
-                       #address-cells = <0>;
-                       #interrupt-cells = <1>;
-                       reg = <0 0x4000 0x200>;
-                       interrupt-controller;
-               };
-
-               nor_flash@1,0 {
-                       compatible = "cfi-flash";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       bank-width = <2>;
-                       reg = <1 0 0x1000000>;
-
-                       partition@0 {
-                               label = "x-loader";
-                               reg = <0x0 0x100000>; /* 1M */
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "u-boot";
-                               reg = <0x100000 0x100000>; /* 1M */
-                       };
-
-                       partition@200000 {
-                               label = "kernel";
-                               reg = <0x200000 0x500000>; /* 5M */
-                       };
-
-                       partition@700000 {
-                               label = "rootfs";
-                               reg = <0x700000 0x800000>; /* 8M */
-                       };
-
-                       partition@f00000 {
-                               label = "env";
-                               reg = <0xf00000 0x100000>; /* 1M */
-                               read-only;
-                       };
-               };
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
-       };
-};