treewide: rename POWER_ON_STRIP register

AR8327 datasheet[1] calls the register at address 0x0010
"Power-on Strapping Register". As it has nothing to do with "strip",
let's rename it to "POWER_ON_STRAP" to make it easier to grasp.

[1] https://lafibre.info/images/doc/201106_spec_AR8327.pdf

Signed-off-by: Sungbo Eo <mans0n@gorani.run>

diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
index 09edeb58840fb1911b47626010460c59a793edd7..4ce280f869bd5c74a9e8fa9461e338f7b440c4fb 100644 (file)
--- a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
+++ b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
@@ -131,7 +131,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x07600000 /* PORT0 PAD MODE CTRL */
-                       0x10 0x80000080 /* POWER_ON_STRIP */
+                       0x10 0x80000080 /* POWER_ON_STRAP */
                        0x50 0x00000000 /* LED_CTRL0 */
                        0x54 0xc737c737 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index dc85075bcf72f556c2059f8e3a58566105118337..fd9f2b48ca1c0bc7ecb86417ca9215bd47665ff3 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -99,7 +99,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x07600000 /* PORT0 PAD MODE CTRL */
-                       0x10 0x80000080 /* POWER_ON_STRIP */
+                       0x10 0x80000080 /* POWER_ON_STRAP */
                        0x50 0xc737c737 /* LED_CTRL0 */
                        0x54 0x00000000 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
index 871928c0a9e866c4dfd8fbb6807ce5cb8418e7b0..18a52458a9497bfd355f2f842e6b542997c3a94d 100644 (file)
--- a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
@@ -192,7 +192,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x07600000 /* PORT0 PAD MODE CTRL */
-                       0x10 0x80000080 /* POWER_ON_STRIP */
+                       0x10 0x80000080 /* POWER_ON_STRAP */
                        0x50 0xc737c737 /* LED_CTRL0 */
                        0x54 0x00000000 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
index 1a93a023afafbe0cc2d7427f0b70cc1d79c41e5b..59926ef44ac50ee8f083292505d05cd7b566a0dc 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
@@ -51,7 +51,7 @@
                qca,ar8327-initvals = <
                        0x04 0x87600000 /* PORT0 PAD MODE CTRL */
                        0x0c 0x00080080 /* PORT6 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x7c 0x0000007e /* PORT0_STATUS */
                        0x94 0x0000007e /* PORT6 STATUS */
                        >;

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 161f8ccb0afb2ac8c169ac75e40297e885692264..9c5e2c7d5384b712e54fd3fd525b2b06402b3f00 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -134,7 +134,7 @@
                qca,ar8327-initvals = <
                        0x04 0x00080080 /* PORT0 PAD MODE CTRL */
                        0x0c 0x07600000 /* PORT6 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcc35cc35 /* LED_CTRL0 */
                        0x54 0xca35ca35 /* LED_CTRL1 */
                        0x58 0xc935c935 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
index 3cafda1d3e22f2fb3d221de1cdfa96b6aa52b21d..6e7faf5983c1a0648680ece03d7ebaa6ee73e9c2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
+++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
@@ -170,7 +170,7 @@
                qca,ar8327-initvals = <
                        0x04 0x00080080 /* PORT0 PAD MODE CTRL */
                        0x0c 0x07600000 /* PORT6 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x7c 0x0000007e /* PORT0_STATUS */
                        0x94 0x0000007e /* PORT6 STATUS */
                >;

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index aa33eed16493af353a1024cdd4110e8e769b4789..224926352247c42c2fa1dd0707e605a97dfe7877 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -210,7 +210,7 @@
                qca,ar8327-initvals = <
                        0x04 0x87600000 /* PORT0 PAD MODE CTRL */
                        0x0c 0x00080080 /* PORT6 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xffb7ffb7 /* LED_CTRL0 */
                        0x54 0xffb7ffb7 /* LED_CTRL1 */
                        0x58 0xffb7ffb7 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
index 5e2c614dfc320a294f706c7eab18bcf69d0f1bdb..0d8063de3530bf1458b44ee71f12fd1f6551b520 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
@@ -109,7 +109,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcc35cc35 /* LED_CTRL0 */
                        0x54 0xcb37cb37 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
index 4b328c5cf3cf6eef69f747e29fabde8d22fe025d..25580b1c9966a67909ed405e06ef9365d525e838 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
@@ -144,7 +144,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcc35cc35 /* LED_CTRL0 */
                        0x54 0xcb37cb37 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 2c0b0b0d71cd326715f272f01fece0a50e4e230b..111d073aa6fef538ea67ea79b186e938c6320f85 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -187,7 +187,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x00000080 /* PORT0 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcc35cc35 /* LED_CTRL0 */
                        0x54 0xcb37cb37 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index ba185c568b23cbba3419cc051820cabe789f8e0b..802641bbc2a6fc3200b8ab31991d285f1e72acab 100644 (file)
--- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
+++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
@@ -114,7 +114,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcc35cc35 /* LED_CTRL0 */
                        0x54 0xcb37cb37 /* LED_CTRL1 */
                        0x58 0x00000000 /* LED_CTRL2 */

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
index 44bcc1e53884351b24657a593b31b5a4b17e99ef..633543e739e004116c58763cccc12408b22d7d3f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -155,7 +155,7 @@
                        0x04 0x80080080 /* PORT0 PAD MODE CTRL */
                        0x08 0x00000000 /* PORT5 PAD MODE CTRL */
                        0x0c 0x00000000 /* PORT6 PAD MODE CTRL */
-                       0x10 0x00000080 /* POWER_ON_STRIP */
+                       0x10 0x00000080 /* POWER_ON_STRAP */
                        0x7c 0x0000007e /* PORT0_STATUS */
                        0x94 0x00000200 /* PORT6_STATUS */
                        >;

diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
index c80aec409e89a336a8720e24986bd9c2dfcb9233..81aa8dc935577bc560cf7fd1485e2bcdf8f88682 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@@ -42,7 +42,7 @@
 
                qca,ar8327-initvals = <
                        0x04 0x00080080 /* PORT0 PAD MODE CTRL */
-                       0x10 0x81000080 /* POWER_ON_STRIP */
+                       0x10 0x81000080 /* POWER_ON_STRAP */
                        0x50 0xcf37cf37 /* LED_CTRL0 */
                        0x54 0xcf37cf37 /* LED_CTRL1 */
                        0x58 0xcf37cf37 /* LED_CTRL2 */

diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.c b/target/linux/generic/files/drivers/net/phy/ar8327.c
index 4cbfa4d234b2b8668510b3513b0472406b605127..dce52ce0e48c7ea2ed8e6eec4eb352d927756d12 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/ar8327.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8327.c
@@ -553,15 +553,15 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
        t = ar8327_get_pad_cfg(pdata->pad6_cfg);
        ar8xxx_write(priv, AR8327_REG_PAD6_MODE, t);
 
-       pos = ar8xxx_read(priv, AR8327_REG_POWER_ON_STRIP);
+       pos = ar8xxx_read(priv, AR8327_REG_POWER_ON_STRAP);
        new_pos = pos;
 
        led_cfg = pdata->led_cfg;
        if (led_cfg) {
                if (led_cfg->open_drain)
-                       new_pos |= AR8327_POWER_ON_STRIP_LED_OPEN_EN;
+                       new_pos |= AR8327_POWER_ON_STRAP_LED_OPEN_EN;
                else
-                       new_pos &= ~AR8327_POWER_ON_STRIP_LED_OPEN_EN;
+                       new_pos &= ~AR8327_POWER_ON_STRAP_LED_OPEN_EN;
 
                ar8xxx_write(priv, AR8327_REG_LED_CTRL0, led_cfg->led_ctrl0);
                ar8xxx_write(priv, AR8327_REG_LED_CTRL1, led_cfg->led_ctrl1);
@@ -569,7 +569,7 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
                ar8xxx_write(priv, AR8327_REG_LED_CTRL3, led_cfg->led_ctrl3);
 
                if (new_pos != pos)
-                       new_pos |= AR8327_POWER_ON_STRIP_POWER_ON_SEL;
+                       new_pos |= AR8327_POWER_ON_STRAP_POWER_ON_SEL;
        }
 
        if (pdata->sgmii_cfg) {
@@ -586,12 +586,12 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
                ar8xxx_write(priv, AR8327_REG_SGMII_CTRL, t);
 
                if (pdata->sgmii_cfg->serdes_aen)
-                       new_pos &= ~AR8327_POWER_ON_STRIP_SERDES_AEN;
+                       new_pos &= ~AR8327_POWER_ON_STRAP_SERDES_AEN;
                else
-                       new_pos |= AR8327_POWER_ON_STRIP_SERDES_AEN;
+                       new_pos |= AR8327_POWER_ON_STRAP_SERDES_AEN;
        }
 
-       ar8xxx_write(priv, AR8327_REG_POWER_ON_STRIP, new_pos);
+       ar8xxx_write(priv, AR8327_REG_POWER_ON_STRAP, new_pos);
 
        if (pdata->leds && pdata->num_leds) {
                int i;

diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.h b/target/linux/generic/files/drivers/net/phy/ar8327.h
index a59d306d6fd05f12850db7ea455044fed5afd776..088b28861855a8560119aeda1f24b87091b9e233 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/ar8327.h
+++ b/target/linux/generic/files/drivers/net/phy/ar8327.h
@@ -53,10 +53,10 @@
 #define   AR8327_PAD_RGMII_TXCLK_DELAY_EN      BIT(25)
 #define   AR8327_PAD_RGMII_EN                  BIT(26)
 
-#define AR8327_REG_POWER_ON_STRIP              0x010
-#define   AR8327_POWER_ON_STRIP_POWER_ON_SEL   BIT(31)
-#define   AR8327_POWER_ON_STRIP_LED_OPEN_EN    BIT(24)
-#define   AR8327_POWER_ON_STRIP_SERDES_AEN     BIT(7)
+#define AR8327_REG_POWER_ON_STRAP              0x010
+#define   AR8327_POWER_ON_STRAP_POWER_ON_SEL   BIT(31)
+#define   AR8327_POWER_ON_STRAP_LED_OPEN_EN    BIT(24)
+#define   AR8327_POWER_ON_STRAP_SERDES_AEN     BIT(7)
 
 #define AR8327_REG_INT_STATUS0                 0x020
 #define   AR8327_INT0_VT_DONE                  BIT(20)

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
index 0998a4933aa172f9339d393330da16e8b7d44661..29b49a9357b7f637ba4c19491ebe77086f17bd48 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
@@ -97,7 +97,7 @@
                                        0x00004 0x07600000 /* PAD0_MODE */
                                        0x00008 0x00000000 /* PAD5_MODE */
                                        0x0000c 0x01000000 /* PAD6_MODE */
-                                       0x00010 0x40000000 /* POWER_ON_STRIP */
+                                       0x00010 0x40000000 /* POWER_ON_STRAP */
                                        0x00050 0xcf35cf35 /* LED_CTRL0 */
                                        0x00054 0xcf35cf35 /* LED_CTRL1 */
                                        0x00058 0xcf35cf35 /* LED_CTRL2 */