[openwrt/openwrt] ath79: split Engenius EPG5000 DTS to common DTSI

LEDE Commits lede-commits at lists.infradead.org
Sun Feb 12 09:20:41 PST 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2742705fa531cdccadafe2a9088bb3b33e568f97

commit 2742705fa531cdccadafe2a9088bb3b33e568f97
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Sat Jan 21 13:45:26 2023 -0500

    ath79: split Engenius EPG5000 DTS to common DTSI
    
    Split the DTS to be used with similar boards made by Senao,
    dual-band routers with Atheros / Qualcomm ethernet switch.
    
    Set initvals for the switch in each device's DTS.
    Set some common calibration nvmem-cells in DTSI.
    
    While at it, fix MTD partition node names.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 .../linux/ath79/dts/qca9558_engenius_epg5000.dts   | 114 ++-------------------
 ..._epg5000.dts => qca955x_senao_router-dual.dtsi} |  80 +++------------
 2 files changed, 23 insertions(+), 171 deletions(-)

diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
index 35716152ad..37ad32f330 100644
--- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "qca955x_senao_router-dual.dtsi"
 
 / {
 	model = "EnGenius EPG5000";
@@ -47,110 +44,13 @@
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
-		};
-
-		wps {
-			label = "wps";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
-		};
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	phy-handle = <&phy0>;
-	pll-data = <0xa6000000 0x00000101 0x00001616>;
-};
-
-&mdio0 {
-	status = "okay";
-
-	phy0: ethernet-phy at 0 {
-		reg = <0>;
-
-		qca,ar8327-initvals = <
-			0x04 0x87600000 /* PORT0 PAD MODE CTRL */
-			0x7c 0x0000007e /* PORT0_STATUS */
-			>;
-	};
-};
-
-&pcie0 {
-	status = "okay";
-
-	wifi at 0,0 {
-		compatible = "pci168c,003c";
-		reg = <0x0000 0 0 0 0>;
-	};
 };
 
-&spi {
-	status = "okay";
-
-	flash at 0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <25000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition at 0 {
-				label = "u-boot";
-				reg = <0x000000 0x030000>;
-				read-only;
-			};
-
-			partition at 30000 {
-				label = "u-boot-env";
-				reg = <0x030000 0x010000>;
-			};
-
-			partition at 40000 {
-				compatible = "denx,uimage";
-				label = "firmware";
-				reg = <0x040000 0xe50000>;
-			};
-
-			partition at 790000 {
-				label = "manufacture";
-				reg = <0xe90000 0x100000>;
-				read-only;
-			};
-
-			partition at ed0000 {
-				label = "backup";
-				reg = <0xf90000 0x010000>;
-				read-only;
-			};
-
-			partition at fe0000 {
-				label = "storage";
-				reg = <0xfa0000 0x050000>;
-				read-only;
-			};
-
-			partition at ff0000 {
-				label = "art";
-				reg = <0xff0000 0x010000>;
-				read-only;
-			};
-		};
-	};
+&phy0 {
+	qca,ar8327-initvals = <
+		0x04 0x87600000 /* PORT0 PAD MODE CTRL */
+		0x7c 0x0000007e /* PORT0_STATUS */
+	>;
 };
 
 &usb_phy1 {
@@ -162,7 +62,5 @@
 };
 
 &wmac {
-	status = "okay";
-
 	qca,no-eeprom;
 };
diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
similarity index 58%
copy from target/linux/ath79/dts/qca9558_engenius_epg5000.dts
copy to target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
index 35716152ad..20bea91e8d 100644
--- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
+++ b/target/linux/ath79/dts/qca955x_senao_router-dual.dtsi
@@ -6,48 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "EnGenius EPG5000";
-	compatible = "engenius,epg5000", "qca,qca9558";
-
-	aliases {
-		led-boot = &led_power;
-		led-failsafe = &led_power;
-		led-running = &led_power;
-		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_power: power {
-			label = "amber:power";
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-			default-state = "on";
-		};
-
-		wlan2g {
-			label = "blue:wlan2g";
-			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
-		};
-
-		wlan5g {
-			label = "blue:wlan5g";
-			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
-		};
-
-		wps_amber {
-			label = "amber:wps";
-			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-		};
-
-		wps_blue {
-			label = "blue:wps";
-			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-		};
-	};
-
 	keys {
 		compatible = "gpio-keys";
 
@@ -79,19 +37,14 @@
 
 	phy0: ethernet-phy at 0 {
 		reg = <0>;
-
-		qca,ar8327-initvals = <
-			0x04 0x87600000 /* PORT0 PAD MODE CTRL */
-			0x7c 0x0000007e /* PORT0_STATUS */
-			>;
 	};
 };
 
 &pcie0 {
 	status = "okay";
 
-	wifi at 0,0 {
-		compatible = "pci168c,003c";
+	ath10k_0: wifi at 0,0,0 {
+		compatible = "qcom,ath10k";
 		reg = <0x0000 0 0 0 0>;
 	};
 };
@@ -118,6 +71,7 @@
 			partition at 30000 {
 				label = "u-boot-env";
 				reg = <0x030000 0x010000>;
+				read-only;
 			};
 
 			partition at 40000 {
@@ -126,43 +80,43 @@
 				reg = <0x040000 0xe50000>;
 			};
 
-			partition at 790000 {
+			partition at e90000 {
 				label = "manufacture";
 				reg = <0xe90000 0x100000>;
 				read-only;
 			};
 
-			partition at ed0000 {
+			partition at f90000 {
 				label = "backup";
 				reg = <0xf90000 0x010000>;
 				read-only;
 			};
 
-			partition at fe0000 {
+			partition at fa0000 {
 				label = "storage";
 				reg = <0xfa0000 0x050000>;
 				read-only;
 			};
 
-			partition at ff0000 {
+			art: partition at ff0000 {
 				label = "art";
 				reg = <0xff0000 0x010000>;
 				read-only;
+
+				compatible = "nvmem-cells";
+
+				calibration_art_1000: calibration at 1000 {
+					reg = <0x1000 0x440>;
+				};
+
+				calibration_art_5000: calibration at 5000 {
+					reg = <0x5000 0x844>;
+				};
 			};
 		};
 	};
 };
 
-&usb_phy1 {
-	status = "okay";
-};
-
-&usb1 {
-	status = "okay";
-};
-
 &wmac {
 	status = "okay";
-
-	qca,no-eeprom;
 };




More information about the lede-commits mailing list