ath79: switch to wpad

This commit is contained in:
AmadeusGhost 2020-02-06 16:50:47 +08:00
parent 021f2e001e
commit 88f65603a6
9 changed files with 217 additions and 18 deletions

View File

@ -4,8 +4,8 @@
#include "ar7161_netgear_wndr3700.dtsi"
/ {
compatible = "netgear,wndr3700v2", "qca,ar7161";
model = "Netgear WNDR3700v2";
compatible = "netgear,wndr3700-v2", "qca,ar7161";
model = "Netgear WNDR3700 v2";
};
&partitions {

View File

@ -0,0 +1,174 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "qca953x.dtsi"
/ {
compatible = "comfast,cf-e560ac", "qca,qca9531";
model = "COMFAST CF-E560AC";
aliases {
serial0 = &uart;
label-mac-device = &eth1;
led-boot = &led_system;
led-failsafe = &led_system;
led-upgrade = &led_system;
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&jtag_disable_pins>;
lan1 {
label = "cf-e560ac:blue:lan1";
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
lan2 {
label = "cf-e560ac:blue:lan2";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
};
lan3 {
label = "cf-e560ac:blue:lan3";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
lan4 {
label = "cf-e560ac:blue:lan4";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
};
led_system: system {
label = "cf-e560ac:blue:system";
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
};
wan {
label = "cf-e560ac:blue:wan";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan {
label = "cf-e560ac:blue:wlan";
gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
watchdog {
compatible = "linux,wdt-gpio";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
hw_algo = "toggle";
hw_margin_ms = <1200>;
always-running;
};
};
&spi {
status = "okay";
num-cs = <1>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x000000 0x010000>;
read-only;
};
art: partition@10000 {
label = "art";
reg = <0x010000 0x010000>;
read-only;
};
partition@20000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x020000 0xfc0000>;
};
partition@fe0000 {
label = "configs";
reg = <0xfe0000 0x010000>;
read-only;
};
partition@ff0000 {
label = "nvram";
reg = <0xff0000 0x010000>;
read-only;
};
};
};
};
&pcie0 {
status = "okay";
};
&uart {
status = "okay";
};
&usb_phy {
status = "okay";
};
&usb0 {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
port@1 {
reg = <1>;
#trigger-source-cells = <0>;
};
};
&eth0 {
status = "okay";
phy-handle = <&swphy4>;
mtd-mac-address = <&art 0x0>;
mtd-mac-address-increment = <1>;
};
&eth1 {
mtd-mac-address = <&art 0x0>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&art 0x0>;
mtd-mac-address-increment = <10>;
};

View File

@ -73,6 +73,13 @@ comfast,cf-e5)
ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:blue:rssi1" "wlan0" "33" "100"
ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:blue:rssi2" "wlan0" "66" "100"
;;
comfast,cf-e560ac)
ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:wan" "eth1"
ucidef_set_led_switch "lan1" "LAN1" "$boardname:blue:lan1" "switch0" "0x02"
ucidef_set_led_switch "lan2" "LAN2" "$boardname:blue:lan2" "switch0" "0x04"
ucidef_set_led_switch "lan3" "LAN3" "$boardname:blue:lan3" "switch0" "0x08"
ucidef_set_led_switch "lan4" "LAN4" "$boardname:blue:lan4" "switch0" "0x10"
;;
dlink,dir-842-c1|\
dlink,dir-842-c2|\
dlink,dir-842-c3|\

View File

@ -103,6 +103,13 @@ ath79_setup_interfaces()
ubnt,routerstation)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
comfast,cf-e560ac|\
tplink,archer-c60-v1|\
tplink,archer-c60-v2)
ucidef_set_interface_wan "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
;;
comfast,cf-wr650ac-v1|\
comfast,cf-wr650ac-v2)
ucidef_add_switch "switch0" \
@ -180,7 +187,7 @@ ath79_setup_interfaces()
"0@eth0" "2:lan" "3:lan" "4:lan" "1:wan"
;;
netgear,wndr3700|\
netgear,wndr3700v2|\
netgear,wndr3700-v2|\
netgear,wndr3800|\
netgear,wndr3800ch)
ucidef_set_interface_wan "eth1"
@ -228,12 +235,6 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
;;
tplink,archer-c60-v1|\
tplink,archer-c60-v2)
ucidef_set_interface_wan "eth1"
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
;;
tplink,archer-d50-v1)
ucidef_add_switch "switch0" \
"0@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "1:wan"
@ -386,7 +387,7 @@ ath79_setup_macs()
label_mac=$wan_mac
;;
netgear,wndr3700|\
netgear,wndr3700v2|\
netgear,wndr3700-v2|\
netgear,wndr3800)
lan_mac=$(macaddr_setbit_la "$(mtd_get_mac_binary art 0x0)")
;;

View File

@ -187,7 +187,7 @@ case "$FIRMWARE" in
case $board in
buffalo,wzr-hp-ag300h|\
netgear,wndr3700|\
netgear,wndr3700v2|\
netgear,wndr3700-v2|\
netgear,wndr3800|\
netgear,wndr3800ch)
ath9k_eeprom_extract "art" 0x1000 0xeb8
@ -205,7 +205,7 @@ case "$FIRMWARE" in
case $board in
buffalo,wzr-hp-ag300h|\
netgear,wndr3700|\
netgear,wndr3700v2|\
netgear,wndr3700-v2|\
netgear,wndr3800|\
netgear,wndr3800ch)
ath9k_eeprom_extract "art" 0x5000 0xeb8

View File

@ -191,6 +191,13 @@ case "$FIRMWARE" in
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
rm /lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
;;
comfast,cf-e560ac)
ath10kcal_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
rm /lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
;;
dlink,dir-842-c1|\
dlink,dir-842-c2|\
dlink,dir-842-c3|\

View File

@ -1,7 +1,7 @@
BOARDNAME:=Generic
FEATURES += minor squashfs
DEFAULT_PACKAGES += wpad-basic
DEFAULT_PACKAGES += wpad
define Target/Description
Build firmware images for generic Atheros AR71xx/AR913x/AR934x based boards.

View File

@ -300,6 +300,16 @@ define Device/comfast_cf-e5
endef
TARGET_DEVICES += comfast_cf-e5
define Device/comfast_cf-e560ac
SOC := qca9531
DEVICE_VENDOR := COMFAST
DEVICE_MODEL := CF-E560AC
DEVICE_PACKAGES := kmod-leds-gpio kmod-usb2 kmod-ath10k-ct \
ath10k-firmware-qca9888-ct
IMAGE_SIZE := 16128k
endef
TARGET_DEVICES += comfast_cf-e560ac
define Device/comfast_cf-wr650ac-v1
SOC := qca9558
DEVICE_VENDOR := COMFAST
@ -648,7 +658,7 @@ define Device/iodata_etg3-r
DEVICE_VENDOR := I-O DATA
DEVICE_MODEL := ETG3-R
IMAGE_SIZE := 7680k
DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic
DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad
endef
TARGET_DEVICES += iodata_etg3-r
@ -819,7 +829,7 @@ define Device/netgear_wndr3700
endef
TARGET_DEVICES += netgear_wndr3700
define Device/netgear_wndr3700v2
define Device/netgear_wndr3700-v2
$(Device/netgear_wndr3x00)
DEVICE_MODEL := WNDR3700
DEVICE_VARIANT := v2
@ -827,9 +837,9 @@ define Device/netgear_wndr3700v2
NETGEAR_BOARD_ID := WNDR3700v2
NETGEAR_HW_ID := 29763654+16+64
IMAGE_SIZE := 15872k
SUPPORTED_DEVICES += wndr3700
SUPPORTED_DEVICES += wndr3700 netgear,wndr3700v2
endef
TARGET_DEVICES += netgear_wndr3700v2
TARGET_DEVICES += netgear_wndr3700-v2
define Device/netgear_wndr3800
$(Device/netgear_wndr3x00)

View File

@ -2,7 +2,7 @@ BOARDNAME := Generic devices with NAND flash
FEATURES += squashfs nand
DEFAULT_PACKAGES += wpad-basic
DEFAULT_PACKAGES += wpad
define Target/Description
Firmware for boards using Qualcomm Atheros, MIPS-based SoCs