[PoC 048/241] global: Migrate CONFIG_GMII to CFG

[Tom Rini]

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 drivers/net/mvneta.c          |  6 +++---
 drivers/net/mvpp2.c           | 12 ++++++------
 include/configs/MPC837XERDB.h |  2 +-
 scripts/config_whitelist.txt  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 0fbfad11d458..7bf744b483a7 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -192,7 +192,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define      MVNETA_GMAC_FORCE_LINK_PASS         BIT(1)
 #define      MVNETA_GMAC_IB_BYPASS_AN_EN         BIT(3)
 #define      MVNETA_GMAC_CONFIG_MII_SPEED        BIT(5)
-#define      MVNETA_GMAC_CONFIG_GMII_SPEED       BIT(6)
+#define      MVNETA_GMAC_CFG_GMII_SPEED       BIT(6)
 #define      MVNETA_GMAC_AN_SPEED_EN             BIT(7)
 #define      MVNETA_GMAC_SET_FC_EN               BIT(8)
 #define      MVNETA_GMAC_ADVERT_FC_EN            BIT(9)
@@ -1163,7 +1163,7 @@ static void mvneta_adjust_link(struct udevice *dev)
 
 		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
 		val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED |
-			 MVNETA_GMAC_CONFIG_GMII_SPEED |
+			 MVNETA_GMAC_CFG_GMII_SPEED |
 			 MVNETA_GMAC_CONFIG_FULL_DUPLEX |
 			 MVNETA_GMAC_AN_SPEED_EN |
 			 MVNETA_GMAC_AN_DUPLEX_EN);
@@ -1187,7 +1187,7 @@ static void mvneta_adjust_link(struct udevice *dev)
 			val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;
 
 		if (phydev->speed == SPEED_1000)
-			val |= MVNETA_GMAC_CONFIG_GMII_SPEED;
+			val |= MVNETA_GMAC_CFG_GMII_SPEED;
 		else if (pp->speed == SPEED_100)
 			val |= MVNETA_GMAC_CONFIG_MII_SPEED;
 
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index 8c9afdf79aba..d9bdf2adad11 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -379,7 +379,7 @@ do {									\
 #define      MVPP2_GMAC_EN_PCS_AN		BIT(2)
 #define      MVPP2_GMAC_AN_BYPASS_EN		BIT(3)
 #define      MVPP2_GMAC_CONFIG_MII_SPEED	BIT(5)
-#define      MVPP2_GMAC_CONFIG_GMII_SPEED	BIT(6)
+#define      MVPP2_GMAC_CFG_GMII_SPEED	BIT(6)
 #define      MVPP2_GMAC_AN_SPEED_EN		BIT(7)
 #define      MVPP2_GMAC_FC_ADV_EN		BIT(9)
 #define      MVPP2_GMAC_EN_FC_AN		BIT(11)
@@ -3064,7 +3064,7 @@ static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port)
 	val = MVPP2_GMAC_EN_PCS_AN |
 		MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_CONFIG_MII_SPEED  |
-		MVPP2_GMAC_CONFIG_GMII_SPEED     |
+		MVPP2_GMAC_CFG_GMII_SPEED     |
 		MVPP2_GMAC_FC_ADV_EN    |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
@@ -3147,7 +3147,7 @@ static void gop_gmac_2500basex_cfg(struct mvpp2_port *port)
 	 */
 	val = MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_EN_PCS_AN |
-		MVPP2_GMAC_CONFIG_GMII_SPEED  |
+		MVPP2_GMAC_CFG_GMII_SPEED  |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
 	writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
@@ -3188,7 +3188,7 @@ static void gop_gmac_1000basex_cfg(struct mvpp2_port *port)
 	 */
 	val = MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_EN_PCS_AN |
-		MVPP2_GMAC_CONFIG_GMII_SPEED  |
+		MVPP2_GMAC_CFG_GMII_SPEED  |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
 	writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
@@ -4441,7 +4441,7 @@ static void mvpp2_link_event(struct mvpp2_port *port)
 
 			val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG);
 			val &= ~(MVPP2_GMAC_CONFIG_MII_SPEED |
-				 MVPP2_GMAC_CONFIG_GMII_SPEED |
+				 MVPP2_GMAC_CFG_GMII_SPEED |
 				 MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 				 MVPP2_GMAC_AN_SPEED_EN |
 				 MVPP2_GMAC_AN_DUPLEX_EN);
@@ -4451,7 +4451,7 @@ static void mvpp2_link_event(struct mvpp2_port *port)
 
 			if (phydev->speed == SPEED_1000 ||
 			    phydev->speed == 2500)
-				val |= MVPP2_GMAC_CONFIG_GMII_SPEED;
+				val |= MVPP2_GMAC_CFG_GMII_SPEED;
 			else if (phydev->speed == SPEED_100)
 				val |= MVPP2_GMAC_CONFIG_MII_SPEED;
 
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2e1264978908..dc7fe06ceb4b 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -183,7 +183,7 @@
  */
 #ifdef CONFIG_TSEC_ENET
 
-#define CONFIG_GMII			/* MII PHY management */
+#define CFG_GMII			/* MII PHY management */
 
 #define CONFIG_TSEC1
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e634d868a090..8203c5ccee12 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -48,7 +48,7 @@ CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
 CFG_FSL_SERDES2
 CFG_GATEWAYIP
-CONFIG_GMII
+CFG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
-- 
2.25.1