ramips: improve support for Zyxel Keenetic Extra II

- drop unneeded default-state for led_power
- concat firmware partitions to extend available free space
- increase spi flash frequency to 32 Mhz (value from stock firmware bootlog)
- drop broken-flash-reset because of onboard flash chip W25Q256FV has reset support
- add compatible for pcie wifi according to kernel documetation
- switch to wan mac address with offset 0x28 in rf-eeprom

Signed-off-by: Maxim Anisimov <maxim.anisimov.ua@gmail.com>
This commit is contained in:
Maxim Anisimov 2023-01-20 14:23:40 +03:00 committed by Hauke Mehrtens
parent 2fe29794b1
commit 3690c4a092
3 changed files with 27 additions and 13 deletions

View file

@ -46,7 +46,6 @@
led_power: power { led_power: power {
label = "green:power"; label = "green:power";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>; gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
default-state = "keep";
}; };
internet { internet {
@ -77,6 +76,23 @@
gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
}; };
}; };
virtual_flash {
compatible = "mtd-concat";
devices = <&firmware1 &firmware2>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x0 0x1d20000>;
};
};
};
}; };
&spi0 { &spi0 {
@ -85,8 +101,7 @@
flash@0 { flash@0 {
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-max-frequency = <10000000>; spi-max-frequency = <32000000>;
broken-flash-reset;
partitions { partitions {
compatible = "fixed-partitions"; compatible = "fixed-partitions";
@ -106,14 +121,13 @@
}; };
factory: partition@40000 { factory: partition@40000 {
label = "factory"; label = "rf-eeprom";
reg = <0x40000 0x10000>; reg = <0x40000 0x10000>;
read-only; read-only;
}; };
partition@50000 { firmware1: partition@50000 {
compatible = "denx,uimage"; label = "firmware_1";
label = "firmware";
reg = <0x50000 0xe90000>; reg = <0x50000 0xe90000>;
}; };
@ -153,10 +167,9 @@
read-only; read-only;
}; };
partition@1050000 { firmware2: partition@1050000 {
label = "firmware_2"; label = "firmware_2";
reg = <0x1050000 0xe90000>; reg = <0x1050000 0xe90000>;
read-only;
}; };
partition@1ee0000 { partition@1ee0000 {
@ -189,6 +202,7 @@
&pcie0 { &pcie0 {
mt76@0,0 { mt76@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>; mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;

View file

@ -1029,7 +1029,7 @@ endef
TARGET_DEVICES += zbtlink_zbt-we1226 TARGET_DEVICES += zbtlink_zbt-we1226
define Device/zyxel_keenetic-extra-ii define Device/zyxel_keenetic-extra-ii
IMAGE_SIZE := 14912k IMAGE_SIZE := 29824k
BLOCKSIZE := 64k BLOCKSIZE := 64k
DEVICE_VENDOR := ZyXEL DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := Keenetic Extra II DEVICE_MODEL := Keenetic Extra II

View file

@ -228,8 +228,7 @@ ramips_setup_macs()
netgear,r6080|\ netgear,r6080|\
netgear,r6120|\ netgear,r6120|\
wrtnode,wrtnode2p|\ wrtnode,wrtnode2p|\
wrtnode,wrtnode2r|\ wrtnode,wrtnode2r)
zyxel,keenetic-extra-ii)
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1)
;; ;;
hiwifi,hc5611|\ hiwifi,hc5611|\
@ -253,7 +252,8 @@ ramips_setup_macs()
totolink,lr1200) totolink,lr1200)
wan_mac=$(mtd_get_mac_binary factory 0x2e) wan_mac=$(mtd_get_mac_binary factory 0x2e)
;; ;;
keenetic,kn-1613) keenetic,kn-1613|\
zyxel,keenetic-extra-ii)
wan_mac=$(mtd_get_mac_binary rf-eeprom 0x28) wan_mac=$(mtd_get_mac_binary rf-eeprom 0x28)
;; ;;
linksys,e5400) linksys,e5400)