[PATCH 6/6] MIPS: ath79: dts: use ar9331.dtsi from linux v4.7-rc2

[Antony Pavlov]

Nowadays we have AR9331 devicetree from linux v4.7-rc2
in the file dts/src/mips/qca/ar9331.dtsi.

Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
---
 arch/mips/dts/ar9331.dtsi       | 59 -----------------------------------------
 arch/mips/dts/black-swift.dts   |  2 +-
 arch/mips/dts/tplink-mr3020.dts |  2 +-
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
deleted file mode 100644
index 6e20bc5..0000000
--- a/arch/mips/dts/ar9331.dtsi
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <dt-bindings/clock/ath79-clk.h>
-
-#include "skeleton.dtsi"
-
-/ {
-	ref: ref {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-	};
-
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		device_type = "soc";
-		ranges;
-
-		uart: uart at 18020000 {
-			compatible = "qca,ar9330-uart";
-			reg = <0x18020000 0x14>;
-			clocks = <&ref>;
-			clock-names = "uart";
-			status = "disabled";
-		};
-
-		gpio: gpio at 18040000 {
-			compatible = "qca,ar7100-gpio";
-			gpio-controller;
-			reg = <0x18040000 0x100>;
-			#gpio-cells = <2>;
-
-			ngpios = <30>;
-			status = "disabled";
-		};
-
-		pll: pll-controller at 18050000 {
-			compatible = "qca,ar9330-pll";
-			reg = <0x18050000 0x100>;
-
-			clocks = <&ref>;
-			clock-names = "ref";
-
-			#clock-cells = <1>;
-		};
-
-		spi: spi at 1f000000 {
-			compatible = "qca,ar7100-spi";
-			reg = <0x1f000000 0x01000000>;
-
-			clocks = <&pll ATH79_CLK_AHB>;
-			clock-names = "ahb";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index 51e805a..af817db 100644
--- a/arch/mips/dts/black-swift.dts
+++ b/arch/mips/dts/black-swift.dts
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#include "ar9331.dtsi"
+#include <mips/qca/ar9331.dtsi>
 
 / {
 	model = "Black Swift";
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index a9c3f11..831fab8 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -2,7 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 
-#include "ar9331.dtsi"
+#include <mips/qca/ar9331.dtsi>
 
 / {
 	model = "TP-Link TL-MR3020";
-- 
2.7.0