From 4204d70d7a1123fdf11d3f5b1f46143639fa58a6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 15 Feb 2021 17:41:36 +0100 Subject: [PATCH] ath79: create common DTSI for Senao ar724x APs This creates a shared DTSI for ar724x Senao/Engenius APs: - ENH202 v1 - EAP350 v1 - ECB350 v1 Since ar7240/ar7242 have different configuration, this new file mostly contains the partitioning. Suggested-by: Michael Pratt Signed-off-by: Adrian Schmutzler --- .../ath79/dts/ar7240_engenius_enh202-v1.dts | 88 +----------------- .../ath79/dts/ar7242_engenius_eap350-v1.dts | 88 +----------------- .../ath79/dts/ar7242_engenius_ecb350-v1.dts | 88 +----------------- .../linux/ath79/dts/ar724x_senao_loader.dtsi | 91 +++++++++++++++++++ 4 files changed, 94 insertions(+), 261 deletions(-) create mode 100644 target/linux/ath79/dts/ar724x_senao_loader.dtsi diff --git a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts index 51d4a0601d..89b6746c61 100644 --- a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts +++ b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ar7240.dtsi" +#include "ar724x_senao_loader.dtsi" #include #include -#include / { compatible = "engenius,enh202-v1", "qca,ar7240"; @@ -69,92 +69,6 @@ linux,default-trigger = "phy0tpt"; }; }; - - virtual_flash { - compatible = "mtd-concat"; - - devices = <&fwconcat0 &fwconcat1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - compatible = "openwrt,uimage", "denx,uimage"; - openwrt,ih-magic = ; - label = "firmware"; - reg = <0x0 0x0>; - }; - }; - }; -}; - -&spi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <20000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x40000 0x10000>; - }; - - partition@50000 { - label = "custom"; - reg = <0x50000 0x50000>; - read-only; - }; - - partition@a0000 { - label = "loader"; - reg = <0xa0000 0x10000>; - read-only; - }; - - fwconcat1: partition@b0000 { - label = "fwconcat1"; - reg = <0xb0000 0xf0000>; - }; - - partition@1a0000 { - label = "fakeroot"; - reg = <0x1a0000 0x10000>; - read-only; - }; - - fwconcat0: partition@1b0000 { - label = "fwconcat0"; - reg = <0x1b0000 0x4c0000>; - }; - - partition@670000 { - label = "failsafe"; - reg = <0x670000 0x180000>; - read-only; - }; - - art: partition@7f0000 { - label = "art"; - reg = <0x7f0000 0x10000>; - read-only; - }; - }; - }; }; ð0 { diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts index 07d7e4914e..be0f7cbc43 100644 --- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts +++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ar7242.dtsi" +#include "ar724x_senao_loader.dtsi" #include #include -#include / { compatible = "engenius,eap350-v1", "qca,ar7242"; @@ -48,92 +48,6 @@ linux,default-trigger = "phy0tpt"; }; }; - - virtual_flash { - compatible = "mtd-concat"; - - devices = <&fwconcat0 &fwconcat1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - compatible = "openwrt,uimage", "denx,uimage"; - openwrt,ih-magic = ; - label = "firmware"; - reg = <0x0 0x0>; - }; - }; - }; -}; - -&spi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <20000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x40000 0x10000>; - }; - - partition@50000 { - label = "custom"; - reg = <0x50000 0x50000>; - read-only; - }; - - partition@a0000 { - label = "loader"; - reg = <0xa0000 0x10000>; - read-only; - }; - - fwconcat1: partition@b0000 { - label = "fwconcat1"; - reg = <0xb0000 0xf0000>; - }; - - partition@1a0000 { - label = "fakeroot"; - reg = <0x1a0000 0x10000>; - read-only; - }; - - fwconcat0: partition@1b0000 { - label = "fwconcat0"; - reg = <0x1b0000 0x4c0000>; - }; - - partition@670000 { - label = "failsafe"; - reg = <0x670000 0x180000>; - read-only; - }; - - art: partition@7f0000 { - label = "art"; - reg = <0x7f0000 0x10000>; - read-only; - }; - }; - }; }; &mdio0 { diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts index ca488223af..55343e786a 100644 --- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts +++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ar7242.dtsi" +#include "ar724x_senao_loader.dtsi" #include #include -#include / { compatible = "engenius,ecb350-v1", "qca,ar7242"; @@ -48,92 +48,6 @@ linux,default-trigger = "phy0tpt"; }; }; - - virtual_flash { - compatible = "mtd-concat"; - - devices = <&fwconcat0 &fwconcat1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - compatible = "openwrt,uimage", "denx,uimage"; - openwrt,ih-magic = ; - label = "firmware"; - reg = <0x0 0x0>; - }; - }; - }; -}; - -&spi { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <20000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "u-boot-env"; - reg = <0x40000 0x10000>; - }; - - partition@50000 { - label = "custom"; - reg = <0x50000 0x50000>; - read-only; - }; - - partition@a0000 { - label = "loader"; - reg = <0xa0000 0x10000>; - read-only; - }; - - fwconcat1: partition@b0000 { - label = "fwconcat1"; - reg = <0xb0000 0xf0000>; - }; - - partition@1a0000 { - label = "fakeroot"; - reg = <0x1a0000 0x10000>; - read-only; - }; - - fwconcat0: partition@1b0000 { - label = "fwconcat0"; - reg = <0x1b0000 0x4c0000>; - }; - - partition@670000 { - label = "failsafe"; - reg = <0x670000 0x180000>; - read-only; - }; - - art: partition@7f0000 { - label = "art"; - reg = <0x7f0000 0x10000>; - read-only; - }; - }; - }; }; &mdio0 { diff --git a/target/linux/ath79/dts/ar724x_senao_loader.dtsi b/target/linux/ath79/dts/ar724x_senao_loader.dtsi new file mode 100644 index 0000000000..fdc2726e6f --- /dev/null +++ b/target/linux/ath79/dts/ar724x_senao_loader.dtsi @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include + +/ { + virtual_flash { + compatible = "mtd-concat"; + + devices = <&fwconcat0 &fwconcat1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + compatible = "openwrt,uimage", "denx,uimage"; + openwrt,ih-magic = ; + label = "firmware"; + reg = <0x0 0x0>; + }; + }; + }; +}; + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <20000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x40000 0x10000>; + }; + + partition@50000 { + label = "custom"; + reg = <0x50000 0x50000>; + read-only; + }; + + partition@a0000 { + label = "loader"; + reg = <0xa0000 0x10000>; + read-only; + }; + + fwconcat1: partition@b0000 { + label = "fwconcat1"; + reg = <0xb0000 0xf0000>; + }; + + partition@1a0000 { + label = "fakeroot"; + reg = <0x1a0000 0x10000>; + read-only; + }; + + fwconcat0: partition@1b0000 { + label = "fwconcat0"; + reg = <0x1b0000 0x4c0000>; + }; + + partition@670000 { + label = "failsafe"; + reg = <0x670000 0x180000>; + read-only; + }; + + art: partition@7f0000 { + label = "art"; + reg = <0x7f0000 0x10000>; + read-only; + }; + }; + }; +};