Hello Adrian,
On 11/22/19 2:45 PM, Adrian Schmutzler wrote:
> This renames all remaining occurrences of "EEPROM" to "art" to
> further harmonize the partition labelling in ath79.
Hmm, I'm not sure if/why we should to these changes.
Ubiquiti names these partitions "EEPROM" in their firmware
and it contains more information (e.g. board-id / sub-revision)
than just the calibration data.
Best wishes
David
>
> Signed-off-by: Adrian Schmutzler <freif...@adrianschmutzler.de>
> ---
> .../linux/ath79/dts/ar9342_ubnt_lap-120.dts | 2 +-
> .../ath79/dts/ar9342_ubnt_nanobeam-ac.dts | 2 +-
> .../dts/ar9342_ubnt_nanostation-ac-loco.dts | 2 +-
> .../ath79/dts/ar9342_ubnt_nanostation-ac.dts | 4 ++--
> target/linux/ath79/dts/ar9342_ubnt_wa.dtsi | 6 +++---
> target/linux/ath79/dts/ar9342_ubnt_xw.dtsi | 8 ++++----
> .../linux/ath79/dts/qca9533_ubnt_acb-isp.dts | 10 +++++-----
> .../ath79/dts/qca9563_ubnt_unifiac-lite.dtsi | 2 +-
> .../ath79/dts/qca9563_ubnt_unifiac-pro.dtsi | 2 +-
> .../linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 6 +++---
> .../etc/hotplug.d/firmware/11-ath10k-caldata | 20 +++++++++----------
> 11 files changed, 31 insertions(+), 33 deletions(-)
>
> diff --git a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts
> b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts
> index 82f864b8e3..757654eaee 100644
> --- a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts
> +++ b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts
> @@ -26,7 +26,7 @@
> /* default for ar934x, except for 1000M and 10M */
> pll-data = <0x06000000 0x00000101 0x00001313>;
>
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
>
> phy-mode = "rgmii";
> phy-handle = <&phy4>;
> diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
> b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
> index 6e64c7faad..30d054dfed 100644
> --- a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
> +++ b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
> @@ -51,7 +51,7 @@
> /* default for ar934x, except for 1000M and 10M */
> pll-data = <0x06000000 0x00000101 0x00001313>;
>
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
>
> phy-mode = "rgmii";
> phy-handle = <&phy4>;
> diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts
> b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts
> index 9b26d1a628..89904721c0 100644
> --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts
> +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts
> @@ -27,7 +27,7 @@
> /* default for ar934x, except for 1000M and 10M */
> pll-data = <0x06000000 0x00000101 0x00001313>;
>
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
>
> phy-mode = "rgmii";
> phy-handle = <&phy4>;
> diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
> b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
> index b591925154..97597e5f15 100644
> --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
> +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
> @@ -58,7 +58,7 @@
> /* default for ar934x, except for 1000M and 10M */
> pll-data = <0x06000000 0x00000101 0x00001313>;
>
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
>
> phy-mode = "rgmii";
> phy-handle = <&phy0>;
> @@ -73,5 +73,5 @@
> &wmac {
> status = "okay";
>
> - mtd-cal-data = <&eeprom 0x1000>;
> + mtd-cal-data = <&art 0x1000>;
> };
> diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
> b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
> index 30fa299638..2847d4098c 100644
> --- a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
> +++ b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
> @@ -75,8 +75,8 @@
> read-only;
> };
>
> - eeprom: partition@ff0000 {
> - label = "EEPROM";
> + art: partition@ff0000 {
> + label = "art";
> reg = <0xff0000 0x010000>;
> read-only;
> };
> @@ -88,5 +88,5 @@
> status = "okay";
>
> qca,disable-5ghz;
> - mtd-cal-data = <&eeprom 0x1000>;
> + mtd-cal-data = <&art 0x1000>;
> };
> diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
> b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
> index ee42498af1..cf24aba5aa 100644
> --- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
> +++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
> @@ -103,8 +103,8 @@
> read-only;
> };
>
> - eeprom: partition@7f0000 {
> - label = "EEPROM";
> + art: partition@7f0000 {
> + label = "art";
> reg = <0x7f0000 0x010000>;
> read-only;
> };
> @@ -115,9 +115,9 @@
> &wmac {
> status = "okay";
>
> - mtd-cal-data = <&eeprom 0x1000>;
> + mtd-cal-data = <&art 0x1000>;
> };
>
> ð0 {
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
> };
> diff --git a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
> b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
> index 629899e1a2..ded95f3a18 100644
> --- a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
> +++ b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
> @@ -64,8 +64,8 @@
> read-only;
> };
>
> - eeprom: partition@ff0000 {
> - label = "EEPROM";
> + art: partition@ff0000 {
> + label = "art";
> reg = <0xff0000 0x010000>;
> read-only;
> };
> @@ -79,13 +79,13 @@
>
> ð0 {
> status = "okay";
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
> phy-handle = <&swphy4>;
> };
>
> ð1 {
> status = "okay";
> - mtd-mac-address = <&eeprom 0x6>;
> + mtd-mac-address = <&art 0x6>;
>
> gmac-config {
> device = <&gmac>;
> @@ -94,5 +94,5 @@
>
> &wmac {
> status = "okay";
> - mtd-cal-data = <&eeprom 0x1000>;
> + mtd-cal-data = <&art 0x1000>;
> };
> diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
> b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
> index 4f77661fbd..8248e060c5 100644
> --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
> +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
> @@ -21,6 +21,6 @@
> ð0 {
> status = "okay";
>
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
> phy-handle = <&phy4>;
> };
> diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
> b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
> index 3a6c0cd3fa..5a0cf4bade 100644
> --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
> +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
> @@ -25,6 +25,6 @@
> ð0 {
> status = "okay";
>
> - mtd-mac-address = <&eeprom 0x0>;
> + mtd-mac-address = <&art 0x0>;
> phy-handle = <&phy0>;
> };
> diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
> b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
> index bb20caba47..bfad3ff306 100644
> --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
> +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
> @@ -104,8 +104,8 @@
> read-only;
> };
>
> - eeprom: partition@ff0000 {
> - label = "EEPROM";
> + art: partition@ff0000 {
> + label = "art";
> reg = <0xff0000 0x010000>;
> read-only;
> };
> @@ -116,5 +116,5 @@
> &wmac {
> status = "okay";
>
> - mtd-cal-data = <&eeprom 0x1000>;
> + mtd-cal-data = <&art 0x1000>;
> };
> 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 f128e8759f..258efc3bf4 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
> @@ -12,6 +12,15 @@ case "$FIRMWARE" in
> case $board in
> comfast,cf-wr650ac-v1|\
> comfast,cf-wr650ac-v2|\
> + ubnt,unifiac-lite|\
> + ubnt,unifiac-lr|\
> + ubnt,unifiac-mesh|\
> + ubnt,unifiac-mesh-pro|\
> + ubnt,lap-120|\
> + ubnt,nanobeam-ac|\
> + ubnt,nanostation-ac|\
> + ubnt,nanostation-ac-loco|\
> + ubnt,unifiac-pro|\
> yuncore,a770)
> caldata_extract "art" 0x5000 0x844
> ;;
> @@ -101,17 +110,6 @@ case "$FIRMWARE" in
> caldata_extract "art" 0x5000 0x844
> ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8)
> +1)
> ;;
> - ubnt,unifiac-lite|\
> - ubnt,unifiac-lr|\
> - ubnt,unifiac-mesh|\
> - ubnt,unifiac-mesh-pro|\
> - ubnt,lap-120|\
> - ubnt,nanobeam-ac|\
> - ubnt,nanostation-ac|\
> - ubnt,nanostation-ac-loco|\
> - ubnt,unifiac-pro)
> - caldata_extract "EEPROM" 0x5000 0x844
> - ;;
> esac
> ;;
> "ath10k/pre-cal-pci-0000:00:00.0.bin")
>
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
