From f098c612b6db2ee62f3bdcba4e24d481a2a537e8 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 8 Nov 2019 17:51:44 +0100 Subject: [PATCH] ramips: create shared DTSI for Netgear EX2700 and WN3000RP v3 This moves shared code of the named devices into a common DTSI. Remove setting status="okay" for &gpio0 as it's not disabled in mt7620a.dtsi. Signed-off-by: Adrian Schmutzler --- .../ramips/dts/mt7620a_netgear_ex2700.dts | 103 ++++-------------- .../mt7620a_netgear_ex2700_wn3000rp-v3.dtsi | 64 +++++++++++ .../dts/mt7620a_netgear_wn3000rp-v3.dts | 99 ++++------------- 3 files changed, 104 insertions(+), 162 deletions(-) create mode 100755 target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts index 5db2a7ae9c..857f2ed220 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts @@ -10,10 +10,7 @@ /dts-v1/; -#include "mt7620a.dtsi" - -#include -#include +#include "mt7620a_netgear_ex2700_wn3000rp-v3.dtsi" / { compatible = "netgear,ex2700", "ralink,mt7620a-soc"; @@ -26,10 +23,6 @@ led-upgrade = &led_power_green; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; @@ -69,86 +62,30 @@ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; }; -&gpio0 { - status = "okay"; -}; - -&gpio1 { - status = "okay"; -}; - -&spi0 { - status = "okay"; - - m25p80@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - partition@40000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x40000 0x3b0000>; - }; - - art: partition@3f0000 { - label = "art"; - reg = <0x3f0000 0x10000>; - read-only; - }; - }; +&partitions { + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; }; -}; -ðernet { - mtd-mac-address = <&art 0x0>; -}; + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; -&wmac { - mtd-mac-address = <&art 0x6>; - ralink,mtd-eeprom = <&art 0x1000>; -}; + partition@40000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x40000 0x3b0000>; + }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "spi refclk"; - ralink,function = "gpio"; - }; + art: partition@3f0000 { + label = "art"; + reg = <0x3f0000 0x10000>; + read-only; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi new file mode 100755 index 0000000000..000c7535da --- /dev/null +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi @@ -0,0 +1,64 @@ +#include +#include + +#include "mt7620a.dtsi" + +/ { + chosen { + bootargs = "console=ttyS0,57600"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&gpio1 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + + partitions: partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + }; + }; +}; + +ðernet { + mtd-mac-address = <&art 0x0>; +}; + +&wmac { + ralink,mtd-eeprom = <&art 0x1000>; + mtd-mac-address = <&art 0x6>; +}; + +&pinctrl { + state_default: pinctrl0 { + default { + ralink,group = "i2c", "uartf", "spi refclk"; + ralink,function = "gpio"; + }; + }; +}; diff --git a/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts b/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts index 66a5ad5ece..917db865a6 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts @@ -2,10 +2,7 @@ /dts-v1/; -#include "mt7620a.dtsi" - -#include -#include +#include "mt7620a_netgear_ex2700_wn3000rp-v3.dtsi" / { compatible = "netgear,wn3000rp-v3", "ralink,mt7620a-soc"; @@ -18,10 +15,6 @@ led-upgrade = &led_power_green; }; - chosen { - bootargs = "console=ttyS0,57600"; - }; - leds { compatible = "gpio-leds"; @@ -71,82 +64,30 @@ gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - wps { - label = "wps"; - gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; }; -&gpio1 { - status = "okay"; -}; - -&spi0 { - status = "okay"; - - m25p80@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <10000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x30000>; - read-only; - }; - - partition@30000 { - label = "u-boot-env"; - reg = <0x30000 0x10000>; - read-only; - }; - - partition@40000 { - compatible = "denx,uimage"; - label = "firmware"; - reg = <0x40000 0x7b0000>; - }; - - art: partition@7f0000 { - label = "art"; - reg = <0x7f0000 0x10000>; - read-only; - }; - }; +&partitions { + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; }; -}; -ðernet { - mtd-mac-address = <&art 0x0>; -}; + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; -&wmac { - mtd-mac-address = <&art 0x6>; - ralink,mtd-eeprom = <&art 0x1000>; -}; + partition@40000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x40000 0x7b0000>; + }; -&pinctrl { - state_default: pinctrl0 { - default { - ralink,group = "i2c", "uartf", "spi refclk"; - ralink,function = "gpio"; - }; + art: partition@7f0000 { + label = "art"; + reg = <0x7f0000 0x10000>; + read-only; }; }; -- 2.30.2