[openwrt/openwrt] ath79: create common DTSI for Senao ar934x APs
LEDE Commits
lede-commits at lists.infradead.org
Fri Jun 11 00:01:33 PDT 2021
ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/7850f5071a02a1fa49146bcb3c5e4515e2126dff
commit 7850f5071a02a1fa49146bcb3c5e4515e2126dff
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Feb 15 17:30:59 2021 +0100
ath79: create common DTSI for Senao ar934x APs
This creates a shared DTSI for ar934x Senao/Engenius APs:
- EAP300 v2
- ENS202EXT v1
- EAP600
- ECB600
Since ar9341/ar9344 have different configuration, this new file
mostly contains the partitioning.
Suggested-by: Michael Pratt <mcpratt at pm.me>
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
(cherry picked from commit ce8b535ed3aea743f58d8445dfaa1c2ced375f94)
---
.../linux/ath79/dts/ar9341_engenius_eap300-v2.dts | 92 +---------------------
.../ath79/dts/ar9341_engenius_ens202ext-v1.dts | 92 +---------------------
target/linux/ath79/dts/ar9344_engenius_exx600.dtsi | 92 +---------------------
...nius_eap300-v2.dts => ar934x_senao_loader.dtsi} | 53 +------------
4 files changed, 4 insertions(+), 325 deletions(-)
diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
index b830821977..8c87a73508 100644
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9341.dtsi"
+#include "ar934x_senao_loader.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
/ {
model = "Engenius EAP300 v2";
@@ -43,96 +43,6 @@
linux,default-trigger = "phy0tpt";
};
};
-
- virtual_flash {
- compatible = "mtd-concat";
-
- devices = <&fwconcat0 &fwconcat1>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- compatible = "openwrt,uimage", "denx,uimage";
- openwrt,ih-magic = <IH_MAGIC_OKLI>;
- label = "firmware";
- reg = <0x0 0x0>;
- };
- };
- };
-};
-
-&ref {
- clock-frequency = <40000000>;
-};
-
-&spi {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <20000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- read-only;
- };
-
- partition at 40000 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 50000 {
- label = "custom";
- reg = <0x050000 0x050000>;
- read-only;
- };
-
- partition at a0000 {
- label = "loader";
- reg = <0x0a0000 0x010000>;
- read-only;
- };
-
- fwconcat1: partition at b0000 {
- label = "fwconcat1";
- reg = <0x0b0000 0x170000>;
- };
-
- partition at 220000 {
- label = "fakeroot";
- reg = <0x220000 0x010000>;
- read-only;
- };
-
- fwconcat0: partition at 230000 {
- label = "fwconcat0";
- reg = <0x230000 0xbc0000>;
- };
-
- partition at df0000 {
- label = "failsafe";
- reg = <0xdf0000 0x200000>;
- read-only;
- };
-
- art: partition at ff0000 {
- label = "art";
- reg = <0xff0000 0x010000>;
- read-only;
- };
- };
- };
};
ð1 {
diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 8204578c17..5c81020ccd 100644
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9341.dtsi"
+#include "ar934x_senao_loader.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
/ {
model = "Engenius ENS202EXT v1";
@@ -58,96 +58,6 @@
gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
};
};
-
- virtual_flash {
- compatible = "mtd-concat";
-
- devices = <&fwconcat0 &fwconcat1>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- compatible = "openwrt,uimage", "denx,uimage";
- openwrt,ih-magic = <IH_MAGIC_OKLI>;
- label = "firmware";
- reg = <0x0 0x0>;
- };
- };
- };
-};
-
-&ref {
- clock-frequency = <40000000>;
-};
-
-&spi {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <40000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- read-only;
- };
-
- partition at 40000 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 50000 {
- label = "custom";
- reg = <0x050000 0x050000>;
- read-only;
- };
-
- partition at a0000 {
- label = "loader";
- reg = <0x0a0000 0x010000>;
- read-only;
- };
-
- fwconcat1: partition at b0000 {
- label = "fwconcat1";
- reg = <0x0b0000 0x170000>;
- };
-
- partition at 220000 {
- label = "fakeroot";
- reg = <0x220000 0x010000>;
- read-only;
- };
-
- fwconcat0: partition at 230000 {
- label = "fwconcat0";
- reg = <0x230000 0xbc0000>;
- };
-
- partition at df0000 {
- label = "failsafe";
- reg = <0xdf0000 0x200000>;
- read-only;
- };
-
- art: partition at ff0000 {
- label = "art";
- reg = <0xff0000 0x010000>;
- read-only;
- };
- };
- };
};
ð0 {
diff --git a/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi b/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi
index d7036ff675..1c318f2083 100644
--- a/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi
+++ b/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344.dtsi"
+#include "ar934x_senao_loader.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
/ {
aliases {
@@ -35,96 +35,6 @@
linux,default-trigger = "phy1tpt";
};
};
-
- virtual_flash {
- compatible = "mtd-concat";
-
- devices = <&fwconcat0 &fwconcat1>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- compatible = "openwrt,uimage", "denx,uimage";
- openwrt,ih-magic = <IH_MAGIC_OKLI>;
- label = "firmware";
- reg = <0x0 0x0>;
- };
- };
- };
-};
-
-&ref {
- clock-frequency = <40000000>;
-};
-
-&spi {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <40000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x000000 0x040000>;
- read-only;
- };
-
- partition at 40000 {
- label = "u-boot-env";
- reg = <0x040000 0x010000>;
- };
-
- partition at 50000 {
- label = "custom";
- reg = <0x050000 0x050000>;
- read-only;
- };
-
- partition at a0000 {
- label = "loader";
- reg = <0x0a0000 0x010000>;
- read-only;
- };
-
- fwconcat1: partition at b0000 {
- label = "fwconcat1";
- reg = <0x0b0000 0x170000>;
- };
-
- partition at 220000 {
- label = "fakeroot";
- reg = <0x220000 0x010000>;
- read-only;
- };
-
- fwconcat0: partition at 230000 {
- label = "fwconcat0";
- reg = <0x230000 0xbc0000>;
- };
-
- partition at df0000 {
- label = "failsafe";
- reg = <0xdf0000 0x200000>;
- read-only;
- };
-
- art: partition at ff0000 {
- label = "art";
- reg = <0xff0000 0x010000>;
- read-only;
- };
- };
- };
};
&mdio0 {
diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar934x_senao_loader.dtsi
similarity index 63%
copy from target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
copy to target/linux/ath79/dts/ar934x_senao_loader.dtsi
index b830821977..aa8a36d242 100644
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar934x_senao_loader.dtsi
@@ -1,49 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "ar9341.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
#include <dt-bindings/mtd/partitions/uimage.h>
/ {
- model = "Engenius EAP300 v2";
- compatible = "engenius,eap300-v2", "qca,ar9341";
-
- aliases {
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
- };
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "reset";
- gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- linux,code = <KEY_RESTART>;
- };
- };
-
- leds {
- compatible = "gpio-leds";
-
- led_power: power {
- label = "blue:power";
- gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wlan {
- label = "blue:wlan";
- gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
- };
-
virtual_flash {
compatible = "mtd-concat";
@@ -74,7 +33,7 @@
flash at 0 {
compatible = "jedec,spi-nor";
reg = <0>;
- spi-max-frequency = <20000000>;
+ spi-max-frequency = <40000000>;
partitions {
compatible = "fixed-partitions";
@@ -134,13 +93,3 @@
};
};
};
-
-ð1 {
- mtd-mac-address = <&art 0x0>;
-};
-
-&wmac {
- status = "okay";
-
- mtd-cal-data = <&art 0x1000>;
-};
More information about the lede-commits
mailing list