mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Antony Pavlov <antonynpavlov@gmail.com>
To: barebox@lists.infradead.org
Subject: [PATCH 5/6] MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2
Date: Tue, 14 Jun 2016 01:15:06 +0300	[thread overview]
Message-ID: <1465856107-24133-6-git-send-email-antonynpavlov@gmail.com> (raw)
In-Reply-To: <1465856107-24133-1-git-send-email-antonynpavlov@gmail.com>

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

And also see this linux kernel commit:

    commit 2c3694d2e6ead3964aafb31e4e529de219ced92b
    Author: Antony Pavlov <antonynpavlov@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@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@0 {
+		device_type = "memory";
+		reg = <0x00000000 0x4000000>;
+	};
+
 	buttons {
 		compatible = "gpio-keys";
 
@@ -54,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 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@0 {
+		device_type = "memory";
+		reg = <0x00000000 0x2000000>;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -61,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>;
 	};
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2016-06-13 22:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-13 22:15 [PATCH 0/6] MIPS: ath79: sync dts stuff " Antony Pavlov
2016-06-13 22:15 ` [PATCH 1/6] clk: ar933x: fix copyright header Antony Pavlov
2016-06-13 22:15 ` [PATCH 2/6] MIPS: ath79: dts: sync clk stuff with linux v4.7-rc2 Antony Pavlov
2016-06-13 22:15 ` [PATCH 3/6] MIPS: ath79: dts: sync uart " Antony Pavlov
2016-06-13 22:15 ` [PATCH 4/6] MIPS: ath79: dts: sync spi " Antony Pavlov
2016-06-13 22:15 ` Antony Pavlov [this message]
2016-06-13 22:15 ` [PATCH 6/6] MIPS: ath79: dts: use ar9331.dtsi from " Antony Pavlov
2016-06-14  6:40 ` [PATCH 0/6] MIPS: ath79: sync dts stuff with " Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465856107-24133-6-git-send-email-antonynpavlov@gmail.com \
    --to=antonynpavlov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox