[openwrt/openwrt] ath79: Create common DTSI for EAP600 and ECB600
LEDE Commits
lede-commits at lists.infradead.org
Fri Dec 25 04:38:30 EST 2020
ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/23281ebe9634f833a35079921524454bf9d52ca1
commit 23281ebe9634f833a35079921524454bf9d52ca1
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Dec 23 10:31:08 2020 -0500
ath79: Create common DTSI for EAP600 and ECB600
The boards have equivalent hardware except for LEDs
and equivalent device config except for MACs
also use naming convention for mtd-concat partitions
to prepare for upcoming patch
"treewide: use more descriptive names for concatenated partitions"
Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
target/linux/ath79/dts/ar9344_engenius_ecb600.dts | 167 +--------------------
...nius_ecb600.dts => ar9344_engenius_exx600.dtsi} | 37 +----
2 files changed, 8 insertions(+), 196 deletions(-)
diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index 8f838607cc..13167adc4d 100644
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -1,34 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "ar9344.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "ar9344_engenius_exx600.dtsi"
/ {
model = "EnGenius ECB600";
compatible = "engenius,ecb600", "qca,ar9344";
- aliases {
- label-mac-device = ð0;
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
- serial0 = &uart;
- };
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "reset";
- gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- linux,code = <KEY_RESTART>;
- };
- };
-
leds {
compatible = "gpio-leds";
@@ -44,160 +21,20 @@
linux,default-trigger = "phy0tpt";
};
};
-
- ath9k-leds {
- compatible = "gpio-leds";
-
- wifi2g {
- label = "blue:wifi2g";
- gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy1tpt";
- };
- };
-
- virtual_flash {
- compatible = "mtd-concat";
-
- devices = <&firmware1 &firmware2>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- compatible = "openwrt,okli";
- label = "firmware";
- reg = <0x0 0x0>;
- };
- };
- };
-};
-
-&ref {
- clock-frequency = <40000000>;
-};
-
-&uart {
- status = "okay";
-};
-
-&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;
- };
-
- firmware2: partition at b0000 {
- label = "firmware2";
- reg = <0x0b0000 0x170000>;
- };
-
- partition at 220000 {
- label = "fakeroot";
- reg = <0x220000 0x010000>;
- read-only;
- };
-
- firmware1: partition at 230000 {
- label = "firmware1";
- 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 {
- status = "okay";
-
- phy0: ethernet-phy at 0 {
- reg = <0>;
- eee-broken-100tx;
- eee-broken-1000t;
- };
};
ð0 {
- status = "okay";
-
mtd-mac-address = <&art 0x0>;
-
- phy-handle = <&phy0>;
- phy-mode = "rgmii-id";
-
- pll-data = <0x02000000 0x00000101 0x00001313>;
-
- gmac-config {
- device = <&gmac>;
- rgmii-gmac0 = <1>;
- rxdv-delay = <3>;
- rxd-delay = <3>;
- };
};
&pcie {
- status = "okay";
-
- ath9k: wifi at 0,0,0 {
- compatible = "pci168c,0030";
- reg = <0x0 0 0 0 0>;
- qca,no-eeprom;
- qca,disable-5ghz;
+ wifi at 0,0,0 {
mtd-mac-address = <&art 0x0>;
mtd-mac-address-increment = <(-2)>;
- #gpio-cells = <2>;
- gpio-controller;
};
};
&wmac {
- status = "okay";
-
- qca,disable-2ghz;
-
- mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mtd-mac-address-increment = <(-1)>;
};
diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi
similarity index 79%
copy from target/linux/ath79/dts/ar9344_engenius_ecb600.dts
copy to target/linux/ath79/dts/ar9344_engenius_exx600.dtsi
index 8f838607cc..5ae2ea66ef 100644
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_exx600.dtsi
@@ -6,9 +6,6 @@
#include <dt-bindings/input/input.h>
/ {
- model = "EnGenius ECB600";
- compatible = "engenius,ecb600", "qca,ar9344";
-
aliases {
label-mac-device = ð0;
led-boot = &led_power;
@@ -29,22 +26,6 @@
};
};
- leds {
- compatible = "gpio-leds";
-
- led_power: power {
- label = "amber:power";
- gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wifi5g {
- label = "blue:wifi5g";
- gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
- };
-
ath9k-leds {
compatible = "gpio-leds";
@@ -58,7 +39,7 @@
virtual_flash {
compatible = "mtd-concat";
- devices = <&firmware1 &firmware2>;
+ devices = <&fwconcat0 &fwconcat1>;
partitions {
compatible = "fixed-partitions";
@@ -118,8 +99,8 @@
read-only;
};
- firmware2: partition at b0000 {
- label = "firmware2";
+ fwconcat1: partition at b0000 {
+ label = "fwconcat1";
reg = <0x0b0000 0x170000>;
};
@@ -129,8 +110,8 @@
read-only;
};
- firmware1: partition at 230000 {
- label = "firmware1";
+ fwconcat0: partition at 230000 {
+ label = "fwconcat0";
reg = <0x230000 0xbc0000>;
};
@@ -162,8 +143,6 @@
ð0 {
status = "okay";
- mtd-mac-address = <&art 0x0>;
-
phy-handle = <&phy0>;
phy-mode = "rgmii-id";
@@ -183,10 +162,8 @@
ath9k: wifi at 0,0,0 {
compatible = "pci168c,0030";
reg = <0x0 0 0 0 0>;
- qca,no-eeprom;
qca,disable-5ghz;
- mtd-mac-address = <&art 0x0>;
- mtd-mac-address-increment = <(-2)>;
+ qca,no-eeprom;
#gpio-cells = <2>;
gpio-controller;
};
@@ -198,6 +175,4 @@
qca,disable-2ghz;
mtd-cal-data = <&art 0x1000>;
- mtd-mac-address = <&art 0x0>;
- mtd-mac-address-increment = <(-1)>;
};
More information about the lede-commits
mailing list