[openwrt/openwrt] ath79: add support for ALFA Network AP121FE

LEDE Commits lede-commits at lists.infradead.org
Sun Sep 27 19:30:22 EDT 2020


pepe2k pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/66abd58196a8e1195f1e2cd9871b4fc194b6570b

commit 66abd58196a8e1195f1e2cd9871b4fc194b6570b
Author: Piotr Dymacz <pepe2k at gmail.com>
AuthorDate: Sat Mar 21 23:20:31 2020 +0100

    ath79: add support for ALFA Network AP121FE
    
    The AP121FE is a slightly modified version of already supported AP121F
    model (added to ar71xx in 0c6165d21a and to ath79 in 334bbc5198).
    
    The differences in compare to AP121F:
    
    - no micro SD card reader
    - USB data lines are included in Type-A plug
    - USB bus switched to device/peripheral mode (permanently, in bootstrap)
    
    Other than that, specifications are the same:
    
    - Atheros AR9331
    - 400/400/200 MHz (CPU/DDR/AHB)
    - 64 MB of RAM (DDR1)
    - 16 MB of flash (SPI NOR)
    - 1x 10/100 Mbps Ethernet
    - 1T1R 2.4 GHz Wi-Fi, up to 15 dBm
    - 1x IPEX/U.FL connector, internal PCB antenna
    - 3x LED, 1x button, 1x switch
    - 4-pin UART header on PCB (2 mm pitch)
    - USB 2.0 Type-A plug (power and data)
    
    Flash instruction (under U-Boot web recovery mode):
    
    1. Configure PC with static IP 192.168.1.2/24.
    2. Connect PC with RJ45 port, press the reset button, power up device,
       wait for first blink of all LEDs (indicates network setup), then keep
       button for 3 following blinks and release it.
    3. Open 192.168.1.1 address in your browser and upload sysupgrade image.
    
    Signed-off-by: Piotr Dymacz <pepe2k at gmail.com>
---
 .../linux/ath79/dts/ar9331_alfa-network_ap121f.dts | 104 +--------------------
 ..._ap121f.dts => ar9331_alfa-network_ap121f.dtsi} |  26 +-----
 .../ath79/dts/ar9331_alfa-network_ap121fe.dts      |  32 +++++++
 .../ath79/generic/base-files/etc/board.d/01_leds   |   1 +
 .../generic/base-files/etc/board.d/02_network      |   4 +
 target/linux/ath79/image/generic.mk                |   9 ++
 6 files changed, 49 insertions(+), 127 deletions(-)

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
index 286b6d1be2..bfb6d3152c 100644
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
@@ -1,38 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "ar9331.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "ar9331_alfa-network_ap121f.dtsi"
 
 / {
 	model = "ALFA Network AP121F";
 	compatible = "alfa-network,ap121f", "qca,ar9331";
 
-	aliases {
-		label-mac-device = &wmac;
-		led-boot = &led_vpn;
-		led-failsafe = &led_vpn;
-		led-upgrade = &led_vpn;
-		serial0 = &uart;
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-		};
-
-		switch {
-			label = "switch";
-			linux,code = <BTN_0>;
-			gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
@@ -54,81 +27,6 @@
 	};
 };
 
-&eth0 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x0>;
-
-	gmac-config {
-		device = <&gmac>;
-		switch-phy-addr-swap = <0>;
-		switch-phy-swap = <0>;
-	};
-};
-
-&eth1 {
-	status = "okay";
-
-	compatible = "syscon", "simple-mfd";
-};
-
-&spi {
-	status = "okay";
-
-	num-cs = <1>;
-
-	flash at 0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <50000000>;
-		m25p,fast-read;
-
-		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>;
-			};
-
-			art: partition at 40000 {
-				label = "art";
-				reg = <0x040000 0x010000>;
-				read-only;
-			};
-
-			partition at 50000 {
-				compatible = "denx,uimage";
-				label = "firmware";
-				reg = <0x050000 0xfb0000>;
-			};
-		};
-	};
-};
-
-&uart {
-	status = "okay";
-};
-
 &usb {
-	status = "okay";
 	dr_mode = "host";
 };
-
-&usb_phy {
-	status = "okay";
-};
-
-&wmac {
-	status = "okay";
-
-	mtd-cal-data = <&art 0x1000>;
-};
diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
similarity index 77%
copy from target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
copy to target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
index 286b6d1be2..74d65d828a 100644
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
@@ -6,9 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "ALFA Network AP121F";
-	compatible = "alfa-network,ap121f", "qca,ar9331";
-
 	aliases {
 		label-mac-device = &wmac;
 		led-boot = &led_vpn;
@@ -24,32 +21,14 @@
 			label = "reset";
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
 		};
 
 		switch {
 			label = "switch";
 			linux,code = <BTN_0>;
 			gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		lan {
-			label = "ap121f:green:lan";
-			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-		};
-
-		led_vpn: vpn {
-			label = "ap121f:green:vpn";
-			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-		};
-
-		wlan {
-			label = "ap121f:green:wlan";
-			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "phy0tpt";
+			debounce-interval = <60>;
 		};
 	};
 };
@@ -120,7 +99,6 @@
 
 &usb {
 	status = "okay";
-	dr_mode = "host";
 };
 
 &usb_phy {
diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts
new file mode 100644
index 0000000000..178a32f4d0
--- /dev/null
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "ar9331_alfa-network_ap121f.dtsi"
+
+/ {
+	model = "ALFA Network AP121FE";
+	compatible = "alfa-network,ap121fe", "qca,ar9331";
+
+	leds {
+		compatible = "gpio-leds";
+
+		lan {
+			label = "ap121fe:green:lan";
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+		};
+
+		led_vpn: vpn {
+			label = "ap121fe:green:vpn";
+			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan {
+			label = "ap121fe:green:wlan";
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "phy0tpt";
+		};
+	};
+};
+
+&usb {
+	dr_mode = "peripheral";
+};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index ef7a0d4e3c..a90aaf0231 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -13,6 +13,7 @@ case "$board" in
 	ucidef_set_led_switch "wan" "WAN" "$boardname:orange:eth1" "switch0" "0x04"
 	;;
 alfa-network,ap121f|\
+alfa-network,ap121fe|\
 avm,fritz450e)
 	ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
 	;;
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 518ca6f91a..ab8e24adde 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -75,6 +75,9 @@ ath79_setup_interfaces()
 	winchannel,wb2000)
 		ucidef_set_interface_lan "eth0"
 		;;
+	alfa-network,ap121fe)
+		ucidef_set_interface_lan "eth0 usb0"
+		;;
 	avm,fritz4020|\
 	pcs,cr3000|\
 	tplink,archer-c58-v1|\
@@ -398,6 +401,7 @@ ath79_setup_macs()
 		label_mac=$lan_mac
 		;;
 	alfa-network,ap121f|\
+	alfa-network,ap121fe|\
 	engenius,ens202ext-v1)
 		label_mac=$(mtd_get_mac_binary art 0x1002)
 		;;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 3f3a65105a..54e927cb8e 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -228,6 +228,15 @@ define Device/alfa-network_ap121f
 endef
 TARGET_DEVICES += alfa-network_ap121f
 
+define Device/alfa-network_ap121fe
+  SOC := ar9331
+  DEVICE_VENDOR := ALFA Network
+  DEVICE_MODEL := AP121FE
+  DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-usb-gadget-eth -swconfig
+  IMAGE_SIZE := 16064k
+endef
+TARGET_DEVICES += alfa-network_ap121fe
+
 define Device/allnet_all-wap02860ac
   SOC := qca9558
   DEVICE_VENDOR := ALLNET



More information about the lede-commits mailing list