diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2016-06-14 01:15:06 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 08:39:55 +0200 |
| commit | 5017fa52583b59f2c031677dec7e94fb47fd20ec (patch) | |
| tree | b2d3f019405280d56493f5e73c6bd06f14c92f3f /arch/mips/dts | |
| parent | f1772f47984aa1d690307a9b2e18abff5826d68f (diff) | |
| download | barebox-5017fa52583b59f2c031677dec7e94fb47fd20ec.tar.gz barebox-5017fa52583b59f2c031677dec7e94fb47fd20ec.tar.xz | |
MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips/dts')
| -rw-r--r-- | arch/mips/dts/black-swift.dts | 16 | ||||
| -rw-r--r-- | 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 6be228d6db..51e805aae1 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 f6799f1aba..a9c3f11805 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>; }; |