diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network index a6e5802f..1e5bab73 100755 --- a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -40,6 +40,11 @@ ipq40xx_setup_interfaces() ucidef_add_switch "switch0" \ "0u@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "0u@eth1" "5:wan" ;; + nhx,nhx4019) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ucidef_add_switch "switch0" \ + "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0u@eth1" "5:wan" + ;; asus,map-ac2200|\ cilab,meshpoint-one|\ edgecore,ecw5211|\ @@ -55,11 +60,6 @@ ipq40xx_setup_interfaces() ucidef_add_switch "switch0" \ "0u@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" ;; - nhx,nhx4019) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0u@eth1" "5:wan" - ;; avm,fritzbox-4040|\ linksys,ea6350v3|\ pangu,l1000|\ diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 5a7dc452..fd2bc2ce 100755 --- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -110,6 +110,10 @@ case "$FIRMWARE" in unielec,u4019-32m) caldata_extract "0:ART" 0x1000 0x2f20 ;; + nhx,nhx4019) + caldata_extract "0:ART" 0x1000 0x2f20 + ath10k_patch_mac $(mtd_get_mac_binary "0:ART" 0x12) + ;; devolo,magic-2-wifi-next) caldata_extract "ART" 0x1000 0x2f20 ath10k_patch_mac $(mtd_get_mac_ascii APPSBLENV WiFiMacAddress0) @@ -224,9 +228,14 @@ case "$FIRMWARE" in plasmacloud,pa2200 |\ qxwlan,e2600ac-c1 |\ qxwlan,e2600ac-c2 |\ + nhx,nhx4019 |\ unielec,u4019-32m) caldata_extract "0:ART" 0x5000 0x2f20 ;; + nhx,nhx4019) + caldata_extract "0:ART" 0x5000 0x2f20 + ath10k_patch_mac $(mtd_get_mac_binary "0:ART" 0x18) + ;; devolo,magic-2-wifi-next) caldata_extract "ART" 0x5000 0x2f20 ath10k_patch_mac $(mtd_get_mac_ascii APPSBLENV WiFiMacAddress1) diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index 87302653..dcf731f7 100755 --- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -62,7 +62,7 @@ platform_do_upgrade() { aruba,ap-303h |\ pangu,l1000 |\ zbt,z4019 |\ - nhx,nhx4019|\ + nhx,nhx4019 |\ aruba,ap-365 |\ avm,fritzbox-7530 |\ avm,fritzrepeater-1200 |\ diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts index a4ff1a01..e995cbab 100755 --- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts +++ b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-nhx4019.dts @@ -4,7 +4,6 @@ #include #include #include -#include / { model = "openmptcprouter5GX3"; @@ -253,31 +252,10 @@ partition@f0000 { label = "0:APPSBL"; reg = <0xf0000 0x80000>; - read-only; }; - partition@170000 { + art: partition@170000 { label = "0:ART"; reg = <0x170000 0x10000>; - read-only; - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_art_12: macaddr@12 { - reg = <0x12 0x6>; - }; - - macaddr_art_18: macaddr@18 { - reg = <0x18 0x6>; - }; - - precal_art_1000: precal@1000 { - reg = <0x1000 0x2f20>; - }; - - precal_art_5000: precal@5000 { - reg = <0x5000 0x2f20>; - }; }; }; }; @@ -467,6 +445,14 @@ }; }; +&gmac0 { + mtd-mac-address = <&art 0x0>; +}; + +&gmac1 { + mtd-mac-address = <&art 0x6>; +}; + ðphy0 { qcom,single-led-1000; qcom,single-led-100; @@ -515,12 +501,8 @@ &wifi0 { status = "okay"; - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_1000>, <&macaddr_art_12>; }; &wifi1 { status = "okay"; - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_5000>, <&macaddr_art_18>; };