diff options
Diffstat (limited to 'target/linux/ath79')
19 files changed, 78 insertions, 56 deletions
diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi index e8a3bdc399..044f6c5c19 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi @@ -100,7 +100,7 @@ status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&info 0x08>; + mtd-mac-address = <&info 0x8>; }; ð0 { diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts index 0e338fe012..6d9cdf8b3f 100644 --- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts +++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts @@ -126,9 +126,15 @@ reg = <0x020000 0x730000>; }; - tplink: partition@750000 { + info: partition@750000 { + label = "info"; + reg = <0x750000 0x010000>; + read-only; + }; + + partition@760000 { label = "tplink"; - reg = <0x750000 0x0a0000>; + reg = <0x760000 0x090000>; read-only; }; @@ -146,7 +152,7 @@ phy-handle = <&swphy4>; - mtd-mac-address = <&tplink 0x8>; + mtd-mac-address = <&info 0x8>; mtd-mac-address-increment = <1>; }; @@ -158,7 +164,7 @@ status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&tplink 0x8>; + mtd-mac-address = <&info 0x8>; }; &pcie0 { diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts index e103b66cbd..6f7f3cca79 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts @@ -125,9 +125,21 @@ compatible = "tplink,firmware"; }; - config: partition@3b0000 { + partition@3b0000 { + label = "partition-table"; + reg = <0x3b0000 0x010000>; + read-only; + }; + + info: partition@3c0000 { + label = "info"; + reg = <0x3c0000 0x010000>; + read-only; + }; + + partition@3d0000 { label = "config"; - reg = <0x3b0000 0x040000>; + reg = <0x3d0000 0x020000>; read-only; }; @@ -145,7 +157,7 @@ phy-handle = <&swphy4>; - mtd-mac-address = <&config 0x10008>; + mtd-mac-address = <&info 0x8>; }; ð1 { @@ -156,5 +168,5 @@ status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&config 0x10008>; + mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index 887b6eea5f..7c27c97934 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -100,7 +100,7 @@ phy-handle = <&phy4>; pll-data = <0x9e000000 0x80000101 0x80001313>; - mtd-mac-address = <&config 0x10008>; + mtd-mac-address = <&info 0x8>; gmac-config { device = <&gmac>; @@ -144,9 +144,21 @@ reg = <0x020000 0xd70000>; }; - config: partition@d90000 { + partition@d90000 { + label = "partition-table"; + reg = <0xd90000 0x010000>; + read-only; + }; + + info: partition@da0000 { + label = "info"; + reg = <0xda0000 0x020000>; + read-only; + }; + + partition@dc0000 { label = "config"; - reg = <0xd90000 0x260000>; + reg = <0xdc0000 0x230000>; read-only; }; @@ -167,5 +179,5 @@ status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&config 0x10008>; + mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts index db2e38bbcb..dfd299b0a0 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c58-v1.dts @@ -28,8 +28,8 @@ read-only; }; - mac: partition@10000 { - label = "mac"; + info: partition@10000 { + label = "info"; reg = <0x010000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts index 773b071a34..cb0dca59ee 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts @@ -52,8 +52,8 @@ read-only; }; - mac: partition@10000 { - label = "mac"; + info: partition@10000 { + label = "info"; reg = <0x010000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts index e70afbffd9..c2dad233fa 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts @@ -58,8 +58,8 @@ read-only; }; - mac: partition@30000 { - label = "mac"; + info: partition@30000 { + label = "info"; reg = <0x030000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi index aa33d13c85..06df553d49 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi @@ -130,7 +130,7 @@ phy-handle = <&swphy0>; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; mtd-mac-address-increment = <1>; gmac-config { @@ -144,12 +144,12 @@ ð1 { status = "okay"; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; &wmac { status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts index a83b5881d4..349c0623d6 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts @@ -40,8 +40,8 @@ read-only; }; - mac: partition@10000 { - label = "mac"; + info: partition@10000 { + label = "info"; reg = <0x010000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts index c19e4e973d..ebd5254a2c 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts @@ -40,8 +40,8 @@ read-only; }; - mac: partition@1fb00 { - label = "mac"; + info: partition@1fb00 { + label = "info"; reg = <0x01fb00 0x000500>; read-only; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts index 444d54b000..3187bcda63 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts @@ -35,8 +35,8 @@ read-only; }; - mac: partition@1fb00 { - label = "mac"; + info: partition@1fb00 { + label = "info"; reg = <0x01fb00 0x000500>; read-only; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index 993c6acc56..b001938d92 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -76,19 +76,19 @@ phy-handle = <&swphy4>; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; mtd-mac-address-increment = <1>; }; ð1 { status = "okay"; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; &wmac { status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts index 3a6f00bf4e..63185ca7e5 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts @@ -96,8 +96,8 @@ read-only; }; - mac: partition@20000 { - label = "mac"; + info: partition@20000 { + label = "info"; reg = <0x020000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts index e7ceec9b37..7defe6a2a2 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts @@ -96,8 +96,8 @@ read-only; }; - mac: partition@20000 { - label = "mac"; + info: partition@20000 { + label = "info"; reg = <0x020000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi index 275f71316c..15be4c2967 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi @@ -42,12 +42,12 @@ phy-mode = "sgmii"; phy-handle = <&phy0>; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; &wmac { status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts index afcb471670..c205b78545 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-eu.dts @@ -9,8 +9,8 @@ }; &partitions { - mac: partition@630000 { - label = "mac"; + info: partition@630000 { + label = "info"; reg = <0x630000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts index 8655283f58..9990a253ca 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2-int.dts @@ -15,8 +15,8 @@ read-only; }; - mac: partition@7e0000 { - label = "mac"; + info: partition@7e0000 { + label = "info"; reg = <0x7e0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi index 2d3128e037..be691a843b 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi @@ -35,9 +35,9 @@ }; ð0 { - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; &wmac { - mtd-mac-address = <&mac 0x8>; + mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 39b2d0ba49..89a64fbf35 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -98,7 +98,8 @@ case "$FIRMWARE" in tplink,archer-c2-v3|\ tplink,archer-c7-v4|\ tplink,archer-c7-v5|\ - tplink,archer-c25-v1) + tplink,archer-c25-v1|\ + tplink,tl-wr902ac-v1) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1) ;; @@ -118,7 +119,7 @@ case "$FIRMWARE" in ;; tplink,re350k-v1) caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x10008) +2) + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +2) ;; tplink,re355-v1|\ tplink,re450-v1) @@ -134,10 +135,6 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x0fc00) +1) ;; - tplink,tl-wr902ac-v1) - caldata_extract "art" 0x5000 0x844 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary tplink 0x8) -1) - ;; esac ;; "ath10k/cal-pci-0000:01:00.0.bin") @@ -195,19 +192,14 @@ case "$FIRMWARE" in tplink,archer-c6-v2|\ tplink,archer-c6-v2-us) caldata_extract "art" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1) + ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1) ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ;; + tplink,eap225-wall-v2|\ tplink,tl-wpa8630p-v2-eu|\ tplink,tl-wpa8630p-v2-int) caldata_extract "art" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mac 0x8) +1) - ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ - /lib/firmware/ath10k/QCA9888/hw2.0/board.bin - ;; - tplink,eap225-wall-v2) - caldata_extract "art" 0x5000 0x2f20 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin |