ath79: rename EEPROM to art

This renames all remaining occurrences of "EEPROM" to "art" to
further harmonize the partition labelling in ath79. This will
help to reduce the amount of user-space code and might be
beneficial when code is copy/pasted in the future.

Affected are only devices from Ubiquiti, where the XM board is
already using "art" in ath79.

Acked-by: Piotr Dymacz <pepe2k@gmail.com>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts
index 82f864b8e3fdd1911a6055886ef0fdbfc9dc2589..757654eaee8b8958bdf774570b497849ee0c602e 100644 (file)
--- 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 6e64c7faad8289dbdbf7d9dd14112b734b375cd3..30d054dfedf73fa0f251183af47df05112067c19 100644 (file)
--- 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 9b26d1a628d20db83eaa811a7227737e9813ce94..89904721c0ea88af3b0b505568f69a44a5897be6 100644 (file)
--- 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 b59192515414a8155a4ea5146a751d8b9151b6d0..97597e5f15ed68fd8ad8be2d15d801d54fbf5902 100644 (file)
--- 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 30fa299638c49969487502d34d486ce3e523f0c0..2847d4098c9576c0a7584b71b6cd805a595d9511 100644 (file)
--- 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 ee42498af17e703c8f359a78d9e624e2268a4a35..cf24aba5aa9c542c6312e1275cd9e6cf9a1e363a 100644 (file)
--- 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>;
 };
 
 &eth0 {
-       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 629899e1a24a7fc87654d17d326d9be5b05be9fe..ded95f3a182554b5326e9bc2928c445463a490ee 100644 (file)
--- 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 @@
 
 &eth0 {
        status = "okay";
-       mtd-mac-address = <&eeprom 0x0>;
+       mtd-mac-address = <&art 0x0>;
        phy-handle = <&swphy4>;
 };
 
 &eth1 {
        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 4f77661fbd88be626e013d606caaaab97321a9a5..8248e060c5ec4fe05f36e4cf7ae6ee9d93bafbb1 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dtsi
@@ -21,6 +21,6 @@
 &eth0 {
        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 3a6c0cd3faaf67252b6c65e30c7d2c8845bee5fc..5a0cf4badee746f8939ddbae2fa1d833081a7106 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dtsi
@@ -25,6 +25,6 @@
 &eth0 {
        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 bb20caba470549c21c50ce25dc571e3cf7f5563d..bfad3ff306ec7eada0d68d259d314cfaaf6fe31d 100644 (file)
--- 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 0965965931ee870f2f2b1b192c0dc98832638f32..97233fa0e4e71b53848779a3bfd72d41b3f9b381 100644 (file)
--- 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")