From 7edaae16db7fd6e1ec0b8aa6d9f20ee1fd7bcc8a Mon Sep 17 00:00:00 2001 From: Mikhail Zhilkin Date: Wed, 4 May 2022 15:07:28 +0000 Subject: [PATCH] ramips: create new dtsi for Arcadyan routers This commit moves common properties for the boards below to a new dtsi: Beeline Smartbox Flash (Arcadyan WG443223) MTS WG430223 (Arcadyan WG430223) The boards are almost the same. Here is the differences: +------+----------+----------+ | | WG430223 | WG443223 | +------+----------+----------+ | RAM | 128 | 256 | +------+----------+----------+ | USB | - | 1x3.0 | +------+----------+----------+ | LEDS | RG | RGB | +------+----------+----------+ Signed-off-by: Mikhail Zhilkin (cherry picked from commit 5b59137a162c07738abbe9fd37125193b3107cb7) --- .../ramips/dts/mt7621_arcadyan_wg4xx223.dtsi | 198 ++++++++++++++++++ .../dts/mt7621_beeline_smartbox-flash.dts | 187 +---------------- 2 files changed, 199 insertions(+), 186 deletions(-) create mode 100644 target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi diff --git a/target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi b/target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi new file mode 100644 index 0000000000..5a845c4e9b --- /dev/null +++ b/target/linux/ramips/dts/mt7621_arcadyan_wg4xx223.dtsi @@ -0,0 +1,198 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7621.dtsi" + +#include +#include +#include + +/ { + aliases { + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_green; + led-upgrade = &led_status_red; + }; + + leds { + compatible = "gpio-leds"; + + led_status_green: led-1 { + label = "green:status"; + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + led_status_red: led-2 { + label = "red:status"; + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + ubi-concat { + compatible = "mtd-concat"; + devices = <&ubiconcat0 &ubiconcat1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "ubi"; + reg = <0x0 0x5240000>; + }; + }; + }; +}; + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x100000>; + read-only; + }; + + partition@100000 { + label = "u-boot-env"; + reg = <0x100000 0x100000>; + }; + + factory: partition@200000 { + label = "Factory"; + reg = <0x200000 0x100000>; + read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + /* We keep the block below to prevent eth0 MAC + * from randomization. Unique WAN, LAN, WLAN MACs + * are stored in u-boot-env. + */ + + /* Default Ralink MAC (00:0c:43:28:80:xx) */ + macaddr_factory_fff0: macaddr@fff0 { + reg = <0xfff0 0x6>; + }; + }; + + partition@300000 { + label = "firmware"; + reg = <0x300000 0x2000000>; + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x0 0x440000>; + }; + + ubiconcat0: partition@400000 { + label = "ubiconcat0"; + reg = <0x440000 0x1bc0000>; + }; + }; + + partition@2300000 { + label = "Firmware2"; + reg = <0x2300000 0x2000000>; + read-only; + }; + + partition@4300000 { + label = "glbcfg"; + reg = <0x4300000 0x200000>; + read-only; + }; + + partition@4500000 { + label = "board_data"; + reg = <0x4500000 0x100000>; + read-only; + }; + + partition@4600000 { + label = "glbcfg2"; + reg = <0x4600000 0x200000>; + read-only; + }; + + partition@4800000 { + label = "board_data2"; + reg = <0x4800000 0x100000>; + read-only; + }; + + ubiconcat1: partition@4900000 { + label = "ubiconcat1"; + reg = <0x4900000 0x3680000>; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0>; + }; +}; + +&gmac0 { + nvmem-cells = <&macaddr_factory_fff0>; + nvmem-cell-names = "mac-address"; +}; + +&switch0 { + ports { + port@2 { + status = "okay"; + label = "lan2"; + }; + + port@3 { + status = "okay"; + label = "lan1"; + }; + + port@4 { + status = "okay"; + label = "wan"; + }; + }; +}; + +&state_default { + gpio { + groups = "i2c", "jtag"; + function = "gpio"; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_beeline_smartbox-flash.dts b/target/linux/ramips/dts/mt7621_beeline_smartbox-flash.dts index 45feb13756..d373a801d2 100644 --- a/target/linux/ramips/dts/mt7621_beeline_smartbox-flash.dts +++ b/target/linux/ramips/dts/mt7621_beeline_smartbox-flash.dts @@ -1,202 +1,17 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "mt7621.dtsi" - -#include -#include -#include +#include "mt7621_arcadyan_wg4xx223.dtsi" / { compatible = "beeline,smartbox-flash", "mediatek,mt7621-soc"; model = "Beeline SmartBox Flash"; - aliases { - led-boot = &led_status_red; - led-failsafe = &led_status_red; - led-running = &led_status_green; - led-upgrade = &led_status_red; - }; - leds { - compatible = "gpio-leds"; - led-0 { label = "blue:wan"; color = ; function = LED_FUNCTION_WAN; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - - led_status_green: led-1 { - label = "green:status"; - color = ; - function = LED_FUNCTION_STATUS; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - led_status_red: led-2 { - label = "red:status"; - color = ; - function = LED_FUNCTION_STATUS; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - ubi-concat { - compatible = "mtd-concat"; - devices = <&ubiconcat0 &ubiconcat1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "ubi"; - reg = <0x0 0x5240000>; - }; - }; - }; -}; - -&nand { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x100000>; - read-only; - }; - - partition@100000 { - label = "u-boot-env"; - reg = <0x100000 0x100000>; - }; - - factory: partition@200000 { - label = "Factory"; - reg = <0x200000 0x100000>; - read-only; - - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_factory_fff0: macaddr@fff0 { - reg = <0xfff0 0x6>; - }; - }; - - partition@300000 { - label = "firmware"; - reg = <0x300000 0x2000000>; - - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "kernel"; - reg = <0x0 0x440000>; - }; - - ubiconcat0: partition@400000 { - label = "ubiconcat0"; - reg = <0x440000 0x1bc0000>; - }; - }; - - partition@2300000 { - label = "Firmware2"; - reg = <0x2300000 0x2000000>; - read-only; - }; - - partition@4300000 { - label = "glbcfg"; - reg = <0x4300000 0x200000>; - read-only; - }; - - partition@4500000 { - label = "board_data"; - reg = <0x4500000 0x100000>; - read-only; - }; - - partition@4600000 { - label = "glbcfg2"; - reg = <0x4600000 0x200000>; - read-only; - }; - - partition@4800000 { - label = "board_data2"; - reg = <0x4800000 0x100000>; - read-only; - }; - - ubiconcat1: partition@4900000 { - label = "ubiconcat1"; - reg = <0x4900000 0x3680000>; - }; - }; -}; - -&pcie { - status = "okay"; -}; - -&pcie0 { - wifi@0,0 { - compatible = "mediatek,mt76"; - reg = <0x0000 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x0>; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_factory_fff0>; - nvmem-cell-names = "mac-address"; -}; - -&switch0 { - ports { - port@2 { - status = "okay"; - label = "lan2"; - }; - - port@3 { - status = "okay"; - label = "lan1"; - }; - - port@4 { - status = "okay"; - label = "wan"; - }; - }; -}; - -&state_default { - gpio { - groups = "i2c", "jtag"; - function = "gpio"; }; }; -- 2.30.2