From fcb920ffe70af7a3b962d893916aee1619c5fb8e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 5 Jun 2019 15:59:30 +0200 Subject: [PATCH] ath79: Consistently label art partition with lower case This patch harmonizes the label and alias for art partitions across ath79. Since lower case seems to be more frequent, use that consistently. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/base-files/etc/board.d/02_network | 2 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 2 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 9 +++------ target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts | 2 +- target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi | 4 ++-- .../linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts | 4 ++-- target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts | 2 +- .../ath79/dts/ar9331_embeddedwireless_dorin.dts | 2 +- target/linux/ath79/dts/ar9342_iodata_etg3-r.dts | 2 +- target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi | 6 +++--- .../linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts | 2 +- .../ath79/dts/qca9558_librerouter_librerouter-v1.dts | 12 ++++++------ .../linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 2 +- .../ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts | 4 ++-- .../ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts | 4 ++-- .../linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi | 4 ++-- .../linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts | 2 +- .../linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts | 2 +- .../ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts | 2 +- 19 files changed, 33 insertions(+), 36 deletions(-) diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index a2cd0ac3a6..99e7825c67 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -285,7 +285,7 @@ ath79_setup_macs() ;; elecom,wrc-1750ghbk2-i|\ elecom,wrc-300ghbk2-i) - wan_mac=$(macaddr_add "$(mtd_get_mac_binary ART 4098)" -2) + wan_mac=$(macaddr_add "$(mtd_get_mac_binary art 4098)" -2) ;; engenius,ecb1750) lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index ce4df2521b..e6b6d2f230 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -144,7 +144,7 @@ case "$FIRMWARE" in ath9k_eeprom_extract "art" 4096 3768 ;; buffalo,wzr-hp-g450h) - ath9k_eeprom_extract "ART" 4096 1088 + ath9k_eeprom_extract "art" 4096 1088 ;; dlink,dir-825-c1|\ dlink,dir-835-a1) diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 607c04a75f..c3bdc94866 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -100,7 +100,7 @@ case "$FIRMWARE" in ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac") ;; elecom,wrc-1750ghbk2-i) - ath10kcal_extract "ART" 20480 2116 + ath10kcal_extract "art" 20480 2116 ;; engenius,ecb1750) ath10kcal_extract "art" 20480 2116 @@ -134,19 +134,16 @@ case "$FIRMWARE" in ath10kcal_patch_mac $(mtd_get_mac_binary art 12) ;; openmesh,om5p-ac-v2) - ath10kcal_extract "ART" 20480 2116 + ath10kcal_extract "art" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; tplink,archer-a7-v5|\ + tplink,archer-c2-v3|\ tplink,archer-c7-v4|\ tplink,archer-c7-v5) ath10kcal_extract "art" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 8) -1) ;; - tplink,archer-c2-v3) - ath10kcal_extract "ART" 20480 2116 - ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 8) -1) - ;; tplink,archer-c5-v1|\ tplink,archer-c7-v2) ath10kcal_extract "art" 20480 2116 diff --git a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts index d2f40e5565..ac3230f378 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts @@ -9,7 +9,7 @@ }; ð0 { - mtd-mac-address = <&ART 0x0>; + mtd-mac-address = <&art 0x0>; }; &sec_vpn { diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi index 5165efa859..70ce41b84d 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi @@ -89,9 +89,9 @@ label = "u-boot-env"; }; - ART: partition@50000 { + art: partition@50000 { reg = <0x50000 0x10000>; - label = "ART"; + label = "art"; read-only; }; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts index ea30a4d0d3..e76f677fd5 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts @@ -57,7 +57,7 @@ }; ð0 { - mtd-mac-address = <&ART 0x1002>; + mtd-mac-address = <&art 0x1002>; }; &sec_vpn { @@ -70,7 +70,7 @@ ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0000 0 0 0 0>; - mtd-mac-address = <&ART 0x1002>; + mtd-mac-address = <&art 0x1002>; qca,no-eeprom; #gpio-cells = <2>; gpio-controller; diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts index 53df36760f..76f6e80236 100644 --- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts +++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts @@ -111,7 +111,7 @@ }; art: partition@3 { - label = "ART"; + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index 43bec35fa2..d0e0169f1b 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -94,7 +94,7 @@ }; art: partition@3 { - label = "ART"; + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts index 9fce43fd4f..bd2489aa28 100644 --- a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts +++ b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts @@ -93,7 +93,7 @@ }; partition@7f0000 { - label = "ART"; + label = "art"; reg = <0x7f0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi index aad8428b4a..f86ff30fc7 100644 --- a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi @@ -109,8 +109,8 @@ read-only; }; - ART: partition@7f0000 { - label = "ART"; + art: partition@7f0000 { + label = "art"; reg = <0x7f0000 0x10000>; read-only; }; @@ -130,6 +130,6 @@ &wmac { status = "okay"; - mtd-cal-data = <&ART 0x1000>; + mtd-cal-data = <&art 0x1000>; mtd-mac-address = <&info 0x8>; }; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts index 64be0744b2..c173add252 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts @@ -140,7 +140,7 @@ }; art: partition@ff0000 { - label = "ART"; + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts index 9e2f67977a..3b7e3aceda 100644 --- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts +++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts @@ -152,8 +152,8 @@ reg = <0xfd0000 0x20000>; }; - ART: partition@ff0000 { - label = "ART"; + art: partition@ff0000 { + label = "art"; reg = <0xff0000 0x010000>; read-only; }; @@ -184,7 +184,7 @@ status = "okay"; pll-data = <0xa6000000 0x00000101 0x00001616>; - mtd-mac-address = <&ART 0x0>; + mtd-mac-address = <&art 0x0>; phy-handle = <&phy0>; @@ -195,7 +195,7 @@ phy-mode = "sgmii"; pll-data = <0x03000101 0x00000101 0x00001616>; - mtd-mac-address = <&ART 0x6>; + mtd-mac-address = <&art 0x6>; fixed-link { speed = <1000>; @@ -206,6 +206,6 @@ &wmac { status = "okay"; - mtd-cal-data = <&ART 0x1000>; - mtd-mac-address = <&ART 0xc>; + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&art 0xc>; }; diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts index 1e3cf40f71..b6dc43fbfc 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts @@ -123,7 +123,7 @@ }; partition@3 { - label = "ART"; + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts index 287dee6bb1..978fa6af57 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts @@ -44,8 +44,8 @@ read-only; }; - ART: partition@ff0000 { - label = "ART"; + art: partition@ff0000 { + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts index c823f4a342..778e0fd52e 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts @@ -38,8 +38,8 @@ read-only; }; - ART: partition@7f0000 { - label = "ART"; + art: partition@7f0000 { + label = "art"; reg = <0x7f0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi index 8d5bbe180c..2f5c2c4aac 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi @@ -111,7 +111,7 @@ pll-data = <0x03000101 0x00000101 0x00001919>; - mtd-mac-address = <&ART 0x1002>; + mtd-mac-address = <&art 0x1002>; mtd-mac-address-increment = <(-1)>; phy-mode = "sgmii"; phy-handle = <&phy0>; @@ -123,5 +123,5 @@ &wmac { status = "okay"; - mtd-cal-data = <&ART 0x1000>; + mtd-cal-data = <&art 0x1000>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts index 17f07baffd..782a581aca 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts @@ -140,7 +140,7 @@ }; art: partition@7f0000 { - label = "ART"; + label = "art"; reg = <0x7f0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts index 9702da4a34..b4c7e9b45f 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n-v5.dts @@ -65,7 +65,7 @@ }; art: partition@ff0000 { - label = "ART"; + label = "art"; reg = <0xff0000 0x010000>; read-only; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts index ffe5e0a603..07a7409886 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts @@ -70,7 +70,7 @@ }; art: partition@ff0000 { - label = "ART"; + label = "art"; reg = <0xff0000 0x010000>; read-only; }; -- 2.25.1