ソースを参照

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 <[email protected]>
Sungbo Eo 5 年 前
コミット
ab78694fe8

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */
 			>;

+ 1 - 1
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 */

+ 1 - 1
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 */
 		>;

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */

+ 1 - 1
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 */
 			>;

+ 1 - 1
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 */

+ 7 - 7
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;

+ 4 - 4
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)

+ 1 - 1
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 */