[PATCH 5/6] MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2

[Antony Pavlov]

Also sync black-swift.dts with tplink-mr3020.dts.

And also see this linux kernel commit:

    commit 2c3694d2e6ead3964aafb31e4e529de219ced92b
    Author: Antony Pavlov <antonynpavlov at gmail.com>
    Date:   Thu Mar 17 06:34:19 2016 +0300

        MIPS: ath79: add initial support for TP-LINK MR3020

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

diff --git a/arch/mips/dts/black-swift.dts b/arch/mips/dts/black-swift.dts
index 6be228d..51e805a 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 "ar9331.dtsi"
+
 / {
 	model = "Black Swift";
 	compatible = "smartlx,black-swift";
 
-	memory {
-		reg = <0x00000000 0x4000000>;
-	};
-
 	aliases {
 		spiflash = &spiflash;
 	};
 
+	memory at 0 {
+		device_type = "memory";
+		reg = <0x00000000 0x4000000>;
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 
@@ -54,10 +56,10 @@
 	status = "okay";
 
 	/* Winbond W25Q128FV SPI flash */
-	spiflash: m25p80 at 0 {
+	spiflash: w25q128 at 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 f6799f1..a9c3f11 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 "ar9331.dtsi"
 
-	memory {
-		reg = <0x00000000 0x2000000>;
-	};
+/ {
+	model = "TP-Link TL-MR3020";
+	compatible = "tplink,tl-mr3020";
 
 	aliases {
 		spiflash = &spiflash;
 	};
 
+	memory at 0 {
+		device_type = "memory";
+		reg = <0x00000000 0x2000000>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -61,10 +63,10 @@
 	status = "okay";
 
 	/* Spansion S25FL032PIF SPI flash */
-	spiflash: m25p80 at 0 {
+	spiflash: s25sl032p at 0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "m25p80";
+		compatible = "spansion,s25sl032p", "jedec,spi-nor";
 		spi-max-frequency = <104000000>;
 		reg = <0>;
 	};
-- 
2.7.0