Merge branch 'for-next/mips'

3 files changed, 30 insertions, 62 deletions

diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi
deleted file mode 100644
index efc0531c93..0000000000
--- a/arch/mips/dts/ar9331.dtsi
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <dt-bindings/clock/ar933x-clk.h>
-
-#include "skeleton.dtsi"
-
-/ {
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		device_type = "soc";
-		ranges;
-
-		serial0: serial@18020000 {
-			compatible = "qca,ar9330-uart";
-			reg = <0x18020000 0x14>;
-			clocks = <&ar9331_clk AR933X_CLK_UART>;
-			status = "disabled";
-		};
-
-		gpio: gpio@18040000 {
-			compatible = "qca,ar7100-gpio";
-			gpio-controller;
-			reg = <0x18040000 0x100>;
-			#gpio-cells = <2>;
-
-			ngpios = <30>;
-			status = "disabled";
-		};
-
-		ar9331_clk: clock {
-			compatible = "qca,ar933x-clk";
-			reg = <0x18050000 0x48>;
-			#clock-cells = <1>;
-		};
-
-		spi: spi@1f000000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "qca,ath79-spi";
-			reg = <0x1f000000 0x01000000>;
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index d19c381df9..af817dbfc7 100644
--- a/arch/mips/dts/black-swift.dts
+++ b/arch/mips/dts/black-swift.dts
@@ -1,21 +1,23 @@
 /dts-v1/;
 
-#include "ar9331.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
+#include <mips/qca/ar9331.dtsi>
+
 / {
 	model = "Black Swift";
 	compatible = "smartlx,black-swift";
 
-	memory {
-		reg = <0x00000000 0x4000000>;
-	};
-
 	aliases {
 		spiflash = &spiflash;
 	};
 
+	memory@0 {
+		device_type = "memory";
+		reg = <0x00000000 0x4000000>;
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 
@@ -37,7 +39,11 @@
 	};
 };
 
-&serial0 {
+&ref {
+	clock-frequency = <25000000>;
+};
+
+&uart {
 	status = "okay";
 };
 
@@ -50,10 +56,10 @@
 	status = "okay";
 
 	/* Winbond W25Q128FV SPI flash */
-	spiflash: m25p80@0 {
+	spiflash: w25q128@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "m25p80";
+		compatible = "winbond,w25q128", "jedec,spi-nor";
 		spi-max-frequency = <104000000>;
 		reg = <0>;
 	};
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index 804d2908f0..831fab8108 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -1,20 +1,22 @@
 /dts-v1/;
 
-#include "ar9331.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
-/ {
-	model = "TP-LINK MR3020";
-	compatible = "tplink,mr3020";
+#include <mips/qca/ar9331.dtsi>
 
-	memory {
-		reg = <0x00000000 0x2000000>;
-	};
+/ {
+	model = "TP-Link TL-MR3020";
+	compatible = "tplink,tl-mr3020";
 
 	aliases {
 		spiflash = &spiflash;
 	};
 
+	memory@0 {
+		device_type = "memory";
+		reg = <0x00000000 0x2000000>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -44,7 +46,11 @@
 	};
 };
 
-&serial0 {
+&ref {
+	clock-frequency = <25000000>;
+};
+
+&uart {
 	status = "okay";
 };
 
@@ -57,10 +63,10 @@
 	status = "okay";
 
 	/* Spansion S25FL032PIF SPI flash */
-	spiflash: m25p80@0 {
+	spiflash: s25sl032p@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "m25p80";
+		compatible = "spansion,s25sl032p", "jedec,spi-nor";
 		spi-max-frequency = <104000000>;
 		reg = <0>;
 	};