[openwrt/openwrt] ath79: create common DTSI for Senao ar724x APs

LEDE Commits lede-commits at lists.infradead.org
Tue Feb 23 20:54:07 EST 2021


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4204d70d7a1123fdf11d3f5b1f46143639fa58a6

commit 4204d70d7a1123fdf11d3f5b1f46143639fa58a6
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Feb 15 17:41:36 2021 +0100

    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 <mcpratt at pm.me>
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../linux/ath79/dts/ar7240_engenius_enh202-v1.dts  | 88 +---------------------
 .../linux/ath79/dts/ar7242_engenius_eap350-v1.dts  | 88 +---------------------
 .../linux/ath79/dts/ar7242_engenius_ecb350-v1.dts  | 88 +---------------------
 ...nius_eap350-v1.dts => ar724x_senao_loader.dtsi} | 81 --------------------
 4 files changed, 3 insertions(+), 342 deletions(-)

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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
 	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 at 0 {
-				compatible = "openwrt,uimage", "denx,uimage";
-				openwrt,ih-magic = <IH_MAGIC_OKLI>;
-				label = "firmware";
-				reg = <0x0 0x0>;
-			};
-		};
-	};
-};
-
-&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 = <0x0 0x40000>;
-				read-only;
-			};
-
-			partition at 40000 {
-				label = "u-boot-env";
-				reg = <0x40000 0x10000>;
-			};
-
-			partition at 50000 {
-				label = "custom";
-				reg = <0x50000 0x50000>;
-				read-only;
-			};
-
-			partition at a0000 {
-				label = "loader";
-				reg = <0xa0000 0x10000>;
-				read-only;
-			};
-
-			fwconcat1: partition at b0000 {
-				label = "fwconcat1";
-				reg = <0xb0000 0xf0000>;
-			};
-
-			partition at 1a0000 {
-				label = "fakeroot";
-				reg = <0x1a0000 0x10000>;
-				read-only;
-			};
-
-			fwconcat0: partition at 1b0000 {
-				label = "fwconcat0";
-				reg = <0x1b0000 0x4c0000>;
-			};
-
-			partition at 670000 {
-				label = "failsafe";
-				reg = <0x670000 0x180000>;
-				read-only;
-			};
-
-			art: partition at 7f0000 {
-				label = "art";
-				reg = <0x7f0000 0x10000>;
-				read-only;
-			};
-		};
-	};
 };
 
 &eth0 {
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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
 	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 at 0 {
-				compatible = "openwrt,uimage", "denx,uimage";
-				openwrt,ih-magic = <IH_MAGIC_OKLI>;
-				label = "firmware";
-				reg = <0x0 0x0>;
-			};
-		};
-	};
-};
-
-&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 = <0x0 0x40000>;
-				read-only;
-			};
-
-			partition at 40000 {
-				label = "u-boot-env";
-				reg = <0x40000 0x10000>;
-			};
-
-			partition at 50000 {
-				label = "custom";
-				reg = <0x50000 0x50000>;
-				read-only;
-			};
-
-			partition at a0000 {
-				label = "loader";
-				reg = <0xa0000 0x10000>;
-				read-only;
-			};
-
-			fwconcat1: partition at b0000 {
-				label = "fwconcat1";
-				reg = <0xb0000 0xf0000>;
-			};
-
-			partition at 1a0000 {
-				label = "fakeroot";
-				reg = <0x1a0000 0x10000>;
-				read-only;
-			};
-
-			fwconcat0: partition at 1b0000 {
-				label = "fwconcat0";
-				reg = <0x1b0000 0x4c0000>;
-			};
-
-			partition at 670000 {
-				label = "failsafe";
-				reg = <0x670000 0x180000>;
-				read-only;
-			};
-
-			art: partition at 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
 	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 at 0 {
-				compatible = "openwrt,uimage", "denx,uimage";
-				openwrt,ih-magic = <IH_MAGIC_OKLI>;
-				label = "firmware";
-				reg = <0x0 0x0>;
-			};
-		};
-	};
-};
-
-&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 = <0x0 0x40000>;
-				read-only;
-			};
-
-			partition at 40000 {
-				label = "u-boot-env";
-				reg = <0x40000 0x10000>;
-			};
-
-			partition at 50000 {
-				label = "custom";
-				reg = <0x50000 0x50000>;
-				read-only;
-			};
-
-			partition at a0000 {
-				label = "loader";
-				reg = <0xa0000 0x10000>;
-				read-only;
-			};
-
-			fwconcat1: partition at b0000 {
-				label = "fwconcat1";
-				reg = <0xb0000 0xf0000>;
-			};
-
-			partition at 1a0000 {
-				label = "fakeroot";
-				reg = <0x1a0000 0x10000>;
-				read-only;
-			};
-
-			fwconcat0: partition at 1b0000 {
-				label = "fwconcat0";
-				reg = <0x1b0000 0x4c0000>;
-			};
-
-			partition at 670000 {
-				label = "failsafe";
-				reg = <0x670000 0x180000>;
-				read-only;
-			};
-
-			art: partition at 7f0000 {
-				label = "art";
-				reg = <0x7f0000 0x10000>;
-				read-only;
-			};
-		};
-	};
 };
 
 &mdio0 {
diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar724x_senao_loader.dtsi
similarity index 53%
copy from target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
copy to target/linux/ath79/dts/ar724x_senao_loader.dtsi
index 07d7e4914e..fdc2726e6f 100644
--- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
+++ b/target/linux/ath79/dts/ar724x_senao_loader.dtsi
@@ -1,54 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "ar7242.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
 #include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
-	compatible = "engenius,eap350-v1", "qca,ar7242";
-	model = "EnGenius EAP350 v1";
-
-	aliases {
-		label-mac-device = &eth0;
-		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 0 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "blue:power";
-			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
-		};
-	};
-
-	ath9k-leds {
-		compatible = "gpio-leds";
-
-		wlan {
-			label = "blue:wlan";
-			gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-	};
-
 	virtual_flash {
 		compatible = "mtd-concat";
 
@@ -135,38 +89,3 @@
 		};
 	};
 };
-
-&mdio0 {
-	status = "okay";
-
-	phy4: ethernet-phy at 4 {
-		reg = <4>;
-		eee-broken-100tx;
-		eee-broken-1000t;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-handle = <&phy4>;
-	phy-mode = "rgmii-id";
-
-	pll-data = <0x02000000 0x00000101 0x00001313>;
-};
-
-&pcie {
-	status = "okay";
-
-	ath9k: wifi at 0,0,0 {
-		compatible = "pci168c,002a";
-		reg = <0x0 0 0 0 0>;
-		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <1>;
-		qca,no-eeprom;
-		#gpio-cells = <2>;
-		gpio-controller;
-	};
-};



More information about the lede-commits mailing list