From ab78694fe88bf0d65952c13a53ea14e92eb7885f Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jul 2020 22:33:18 +0900 Subject: [PATCH] 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 --- .../linux/ath79/dts/ar9344_compex_wpj344-16m.dts | 2 +- .../linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi | 2 +- target/linux/ath79/dts/ar9344_wd_mynet-n750.dts | 2 +- .../ath79/dts/qca9558_comfast_cf-wr650ac.dtsi | 2 +- .../ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 2 +- .../ath79/dts/qca9558_trendnet_tew-823dru.dts | 2 +- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 2 +- .../linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi | 2 +- .../linux/ath79/dts/qca9563_dlink_dir-859-a1.dts | 2 +- target/linux/ath79/dts/qca9563_netgear_wndr.dtsi | 2 +- target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 2 +- .../ath79/dts/qca9563_tplink_archer-x7-v5.dtsi | 2 +- target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi | 2 +- .../linux/generic/files/drivers/net/phy/ar8327.c | 14 +++++++------- .../linux/generic/files/drivers/net/phy/ar8327.h | 8 ++++---- .../files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts index 09edeb5884..4ce280f869 100644 --- 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 dc85075bcf..fd9f2b48ca 100644 --- 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 871928c0a9..18a52458a9 100644 --- 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 1a93a023af..59926ef44a 100644 --- 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 161f8ccb0a..9c5e2c7d53 100644 --- 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 3cafda1d3e..6e7faf5983 100644 --- 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 aa33eed164..2249263522 100644 --- 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 5e2c614dfc..0d8063de35 100644 --- 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 4b328c5cf3..25580b1c99 100644 --- 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 2c0b0b0d71..111d073aa6 100644 --- 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 ba185c568b..802641bbc2 100644 --- 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 44bcc1e538..633543e739 100644 --- 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 c80aec409e..81aa8dc935 100644 --- 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 4cbfa4d234..dce52ce0e4 100644 --- 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 a59d306d6f..088b288618 100644 --- 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 0998a4933a..29b49a9357 100644 --- 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 */ -- 2.30.2