KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: various fixes for zbt-we1226

Browse source 
Convert userspace code to use generic device-tree compatible board
detection method.  Users of the existing code will have to use
sysupgrade -F once to switch to the new generic board naming.
Properly setup pinctrl fixing the switch port LEDs.

Fixes commit 9c4fe103cb (ramips: add support for ZBT-WE1226)
Reported-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2018-01-24 01:27:51 +01:00
parent a8b023272d
commit 32f120b783
7 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ramips/base-files/etc/board.d/01_leds
View file

@ -491,7 +491,7 @@ zbt-we826-32M)
set_wifi_led "zbt-we826:green:wifi"
set_usb_led "zbt-we826:green:usb"
;;
zbt-we1226)
zbtlink,zbt-we1226)
set_wifi_led "$boardname:green:wlan"
ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x01"
ucidef_set_led_switch "lan2" "LAN2" "$boardname:green:lan2" "switch0" "0x02"

2
target/linux/ramips/base-files/etc/board.d/02_network
View file

@ -350,7 +350,7 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \
"1:lan" "2:lan" "0:wan" "6@eth0"
;;
zbt-we1226|\
zbtlink,zbt-we1226|\
y1)
ucidef_add_switch "switch0" \
"0:lan:2" "1:lan:1" "4:wan" "6@eth0"

4
target/linux/ramips/base-files/etc/diag.sh
View file

@ -315,8 +315,8 @@ get_status_led() {
zbt-we826-32M)
status_led="zbt-we826:green:power"
;;
zbt-we1226)
status_led="zbt-we1226:green:wlan"
zbtlink,zbt-we1226)
status_led="$boardname:green:wlan"
;;
zbt-wg3526-16M|\
zbt-wg3526-32M)

3
target/linux/ramips/base-files/lib/ramips.sh
View file

@ -685,9 +685,6 @@ ramips_board_detect() {
*"ZBT-WA05")
name="zbt-wa05"
;;
*"ZBT-WE1226")
name="zbt-we1226"
;;
*"ZBT-WE1326")
name="zbt-we1326"
;;

2
target/linux/ramips/base-files/lib/upgrade/platform.sh
View file

@ -204,7 +204,7 @@ platform_check_image() {
zbt-ape522ii|\
zbt-cpe102|\
zbt-wa05|\
zbt-we1226|\
zbtlink,zbt-we1226|\
zbt-we1326|\
zbt-we2026|\
zbtlink,zbt-we3526|\

16
target/linux/ramips/dts/ZBT-WE1226.dts
View file

@ -5,7 +5,7 @@
#include "mt7628an.dtsi"
/ {
compatible = "zbt,we1226", "mediatek,mt7628an-soc";
compatible = "zbtlink,zbt-we1226", "mediatek,mt7628an-soc";
model = "Zbtlink ZBT-WE1226";
chosen {
@ -33,19 +33,19 @@
gpio-leds {
compatible = "gpio-leds";
lan2 {
label = "zbt-we1226:green:lan2";
wan {
label = "zbt-we1226:green:wan";
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
};
lan1 {
label = "zbt-we1226:green:lan1";
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
wan {
label = "zbt-we1226:green:wan";
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
lan2 {
label = "zbt-we1226:green:lan2";
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
wlan {
@ -58,7 +58,7 @@
&pinctrl {
state_default: pinctrl0 {
gpio {
ralink,group = "i2c", "wled_an";
ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an";
ralink,function = "gpio";
};
};

4
target/linux/ramips/image/mt76x8.mk
View file

@ -248,9 +248,9 @@ define Device/wrtnode2r
endef
TARGET_DEVICES += wrtnode2r
define Device/zbt-we1226
define Device/zbtlink_zbt-we1226
DTS := ZBT-WE1226
IMAGE_SIZE := $(ralink_default_fw_size_8M)
DEVICE_TITLE := ZBTlink ZBT-WE1226
endef
TARGET_DEVICES += zbt-we1226
TARGET_DEVICES += zbtlink_zbt-we1226