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

ramips: fix BR-6478ACv2 support

Browse source 
The wholesale changes introduced in commit f9b8328 missed this DTS file
because it hadn't been merged yet. This patch brings it in line to match
the other mt7620a devices' DTS files.

Additionally, the Internet LED is now labeled correctly and set to unused
by default, since the WAN interface is not known in every configuration.

Using sysupgrade between images before and after this commit will require
the -F flag.

Tested-by: Rohan Murch <rohan.murch@gmail.com>
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
[drop internet led default setting]
Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Daniel Gimpelevich 2018-08-06 10:52:28 -07:00 committed by Mathias Kresin
parent 5543d63fc8
commit 1d3ea7874d
6 changed files with 57 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,12 +86,6 @@ asl26555-16M)
bc2) bc2)
set_usb_led "$boardname:blue:usb" set_usb_led "$boardname:blue:usb"
;; ;;
br-6478ac-v2)
ucidef_set_led_default "power" "POWER" "$boardname:white:power" "1"
ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" "eth0.2"
set_wifi_led "$boardname:blue:wlan"
set_usb_led "$boardname:blue:usb"
;;
broadway) broadway)
set_usb_led "$boardname:red:diskmounted" set_usb_led "$boardname:red:diskmounted"
set_wifi_led "$boardname:red:wps_active" set_wifi_led "$boardname:red:wps_active"
@ -185,6 +179,10 @@ vr500)
dir-860l-b1) dir-860l-b1)
ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2" ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2"
;; ;;
edimax,br-6478ac-v2)
set_wifi_led "$boardname:blue:wlan"
set_usb_led "$boardname:blue:usb"
;;
ex2700|\ ex2700|\
wn3000rpv3) wn3000rpv3)
set_wifi_led "$boardname:green:router" set_wifi_led "$boardname:green:router"

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

@ -283,6 +283,11 @@ ramips_setup_interfaces()
ucidef_add_switch "switch1" \ ucidef_add_switch "switch1" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;; ;;
edimax,br-6478ac-v2|\
tplink,c2-v1)
ucidef_add_switch "switch1" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;;
hc5*61|\ hc5*61|\
y1s) y1s)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
@ -342,11 +347,6 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0@eth0"
;; ;;
br-6478ac-v2|\
tplink,c2-v1)
ucidef_add_switch "switch1" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;;
tplink,tl-wr902ac-v3) tplink,tl-wr902ac-v3)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"4:lan" "6@eth0" "4:lan" "6@eth0"
@ -448,10 +448,6 @@ ramips_setup_macs()
lan_mac=$(cat /sys/class/net/eth0/address) lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(mtd_get_mac_binary devdata 7) wan_mac=$(mtd_get_mac_binary devdata 7)
;; ;;
br-6478ac-v2)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 2)
;;
cy-swr1100|\ cy-swr1100|\
dch-m225) dch-m225)
lan_mac=$(mtd_get_mac_ascii factory lanmac) lan_mac=$(mtd_get_mac_ascii factory lanmac)
@ -472,6 +468,10 @@ ramips_setup_macs()
e1700) e1700)
wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR) wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
;; ;;
edimax,br-6478ac-v2)
lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 2)
;;
elecom,wrc-1167ghbk2-s|\ elecom,wrc-1167ghbk2-s|\
elecom,wrc-2533gst|\ elecom,wrc-2533gst|\
sk-wb8) sk-wb8)

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

@ -82,9 +82,6 @@ ramips_board_detect() {
*"BR-6475nD") *"BR-6475nD")
name="br-6475nd" name="br-6475nd"
;; ;;
*"BR-6478AC v2")
name="br-6478ac-v2"
;;
*"Broadway") *"Broadway")
name="broadway" name="broadway"
;; ;;

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

@ -241,7 +241,7 @@ platform_check_image() {
3g-6200n|\ 3g-6200n|\
3g-6200nl|\ 3g-6200nl|\
br-6475nd|\ br-6475nd|\
br-6478ac-v2) edimax,br-6478ac-v2)
[ "$magic" != "43535953" ] && { [ "$magic" != "43535953" ] && {
echo "Invalid image type." echo "Invalid image type."
return 1 return 1

84
target/linux/ramips/dts/BR-6478AC-V2.dts
View file

@ -32,8 +32,6 @@
gpio-keys-polled { gpio-keys-polled {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <20>; poll-interval = <20>;
reset_wps { reset_wps {
@ -50,8 +48,8 @@
label = "br-6478ac-v2:white:power"; label = "br-6478ac-v2:white:power";
gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
}; };
wan { internet {
label = "br-6478ac-v2:blue:wan"; label = "br-6478ac-v2:blue:internet";
gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
}; };
wlan { wlan {
@ -71,7 +69,7 @@
usb-power { usb-power {
gpio-export,name="usb-power"; gpio-export,name="usb-power";
gpio-export,output=<1>; gpio-export,output=<1>;
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* pin45 */ gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
}; };
}; };
}; };
@ -81,45 +79,47 @@
status = "okay"; status = "okay";
}; };
&spi0 { &spi0 {
status = "okay"; status = "okay";
m25p80@0 { flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
reg = <0 0>; reg = <0 0>;
linux,modalias = "m25p80", "mx25l6405d";
spi-max-frequency = <10000000>; spi-max-frequency = <10000000>;
partition@0 { partitions {
label = "u-boot"; compatible = "fixed-partitions";
reg = <0x0 0x30000>; #address-cells = <1>;
read-only; #size-cells = <1>;
};
partition@30000 { partition@0 {
label = "u-boot-env"; label = "u-boot";
reg = <0x30000 0x10000>; reg = <0x0 0x30000>;
read-only; read-only;
}; };
factory: partition@40000 { partition@30000 {
label = "factory"; label = "u-boot-env";
reg = <0x40000 0x10000>; reg = <0x30000 0x10000>;
read-only; read-only;
}; };
partition@50000 { factory: partition@40000 {
label = "cimage"; label = "factory";
reg = <0x50000 0x20000>; reg = <0x40000 0x10000>;
read-only; read-only;
}; };
partition@70000 { partition@50000 {
label = "firmware"; label = "cimage";
reg = <0x00070000 0x00790000>; reg = <0x50000 0x20000>;
read-only;
};
partition@70000 {
label = "firmware";
reg = <0x00070000 0x00790000>;
};
}; };
}; };
}; };
@ -127,8 +127,7 @@
&pinctrl { &pinctrl {
state_default: pinctrl0 { state_default: pinctrl0 {
gpio { gpio {
ralink,group = "i2c", "uartf", "wdt", "pa", ralink,group = "i2c", "uartf", "nd_sd";
"ephy", "nd_sd", "wled";
ralink,function = "gpio"; ralink,function = "gpio";
}; };
}; };
@ -186,23 +185,20 @@
mediatek,port4 = "gmac"; mediatek,port4 = "gmac";
}; };
&wmac { &wmac {
ralink,mtd-eeprom = <&factory 0>; ralink,mtd-eeprom = <&factory 0>;
}; };
&pcie { &pcie {
status = "okay"; status = "okay";
};
pcie-bridge { &pcie0 {
mt76@0,0 { wifi@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
device_type = "pci"; mediatek,mtd-eeprom = <&factory 0x8000>;
mediatek,mtd-eeprom = <&factory 0x8000>; mediatek,2ghz = <0>;
mediatek,2ghz = <0>;
};
}; };
}; };
&ehci { &ehci {

6
target/linux/ramips/image/mt7620.mk
View file

@ -475,7 +475,7 @@ define Device/tiny-ac
endef endef
TARGET_DEVICES += tiny-ac TARGET_DEVICES += tiny-ac
define Device/br-6478ac-v2 define Device/edimax_br-6478ac-v2
DTS := BR-6478AC-V2 DTS := BR-6478AC-V2
DEVICE_TITLE := Edimax BR-6478AC V2 DEVICE_TITLE := Edimax BR-6478AC V2
BLOCKSIZE := 64k BLOCKSIZE := 64k
@ -483,9 +483,9 @@ define Device/br-6478ac-v2
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \
edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \ edimax-header -s CSYS -m RN68 -f 0x70000 -S 0x01100000 | pad-rootfs | \
append-metadata | check-size $$$$(IMAGE_SIZE) append-metadata | check-size $$$$(IMAGE_SIZE)
DEVICE_PACKAGES := kmod-mt76 DEVICE_PACKAGES := kmod-mt76 kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
endef endef
TARGET_DEVICES += br-6478ac-v2 TARGET_DEVICES += edimax_br-6478ac-v2
define Device/tplink_c2-v1 define Device/tplink_c2-v1
$(Device/Archer) $(Device/Archer)