net: rename "FSL UECx" net interfaces "UECx"

PATCH New Kim Phillips 2 participants 2 messages Jul 26, 2010 – Jul 29, 2010

Share & tools

Kim Phillips

author

2010-07-26 23:34 UTC #0 lore raw

PATCH 1/1 net: rename "FSL UECx" net interfaces "UECx"

continuation of commit 2ecc2262d66a286e3aac79005bcb5f461312dea8 "net ppc: fix ethernet device names with spaces" (currently in u-boot-net.git) for QE based parts.

Signed-off-by Kim Phillips <[email protected]>

---
 doc/README.kmeter1            |    2 +-
 drivers/qe/uec.c              |    2 +-
 drivers/qe/uec_phy.c          |    6 +++---
 include/configs/MPC8323ERDB.h |    2 +-
 include/configs/MPC832XEMDS.h |    2 +-
 include/configs/MPC8360EMDS.h |    2 +-
 include/configs/MPC8360ERDK.h |    2 +-
 include/configs/MPC8568MDS.h  |    2 +-
 include/configs/MPC8569MDS.h  |    2 +-
 include/configs/kmeter1.h     |    2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

doc/README.kmeter1 +1 -1

index 44ebb7a..7f4fc99 100644
@@ -51,7 +51,7 @@ Keymile kmeter1 Board
 
 	tftp 10000 u-boot.bin
     => run load
-    Using FSL UEC0 device
+    Using UEC0 device
     TFTP from server 192.168.1.1; our IP address is 192.168.205.4
     Filename '/tftpboot/kmeter1/u-boot.bin'.
     Load address: 0x200000

drivers/qe/uec.c +1 -1

index ccbf27d..3e92fe9 100644
@@ -1367,7 +1367,7 @@ int uec_initialize(bd_t *bis, uec_info_t *uec_info)
 	uec->uec_info = uec_info;
 	uec->dev = dev;
 
-	sprintf(dev->name, "FSL UEC%d", uec_info->uf_info.ucc_num);
+	sprintf(dev->name, "UEC%d", uec_info->uf_info.ucc_num);
 	dev->iobase = 0;
 	dev->priv = (void *)uec;
 	dev->init = uec_init;

drivers/qe/uec_phy.c +3 -3

index 3baffe4..2d3a896 100644
@@ -71,8 +71,8 @@
  *                 {name, speed, duplex},
  *
  *     #define CONFIG_SYS_FIXED_PHY_PORTS \
- *                 CONFIG_SYS_FIXED_PHY_PORT("FSL UEC0",SPEED_100,DUPLEX_FULL) \
- *                 CONFIG_SYS_FIXED_PHY_PORT("FSL UEC2",SPEED_100,DUPLEX_HALF)
+ *                 CONFIG_SYS_FIXED_PHY_PORT("UEC0",SPEED_100,DUPLEX_FULL) \
+ *                 CONFIG_SYS_FIXED_PHY_PORT("UEC2",SPEED_100,DUPLEX_HALF)
  */
 
 #ifndef CONFIG_FIXED_PHY

@@ -102,7 +102,7 @@ static const struct fixed_phy_port fixed_phy_port[] = {
  * Example board header file to define bitbang ethernet ports:
  *
  * #define CONFIG_SYS_BITBANG_PHY_PORT(name) name,
- * #define CONFIG_SYS_BITBANG_PHY_PORTS CONFIG_SYS_BITBANG_PHY_PORT("FSL UEC0")
+ * #define CONFIG_SYS_BITBANG_PHY_PORTS CONFIG_SYS_BITBANG_PHY_PORT("UEC0")
 */
 #ifndef CONFIG_SYS_BITBANG_PHY_PORTS
 #define CONFIG_SYS_BITBANG_PHY_PORTS	/* default is an empty array */

include/configs/MPC8323ERDB.h +1 -1

index 7c84393..9a296a1 100644
@@ -338,7 +338,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* ETH3 */

include/configs/MPC832XEMDS.h +1 -1

index 7bd2793..68ff191 100644
@@ -353,7 +353,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* ETH3 */

include/configs/MPC8360EMDS.h +1 -1

index 87a137b..c58e003 100644
@@ -390,7 +390,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 #define CONFIG_PHY_MODE_NEED_CHANGE
 
 #define CONFIG_UEC_ETH1		/* GETH1 */

include/configs/MPC8360ERDK.h +1 -1

index e78cf60..9fa577d 100644
@@ -309,7 +309,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* GETH1 */

include/configs/MPC8568MDS.h +1 -1

index 0cc2d47..2c001e2 100644
@@ -316,7 +316,7 @@ extern unsigned long get_clock_freq(void);
  */
 #define CONFIG_UEC_ETH
 #ifndef CONFIG_TSEC_ENET
-#define CONFIG_ETHPRIME         "FSL UEC0"
+#define CONFIG_ETHPRIME         "UEC0"
 #endif
 #define CONFIG_PHY_MODE_NEED_CHANGE
 #define CONFIG_eTSEC_MDIO_BUS

include/configs/MPC8569MDS.h +1 -1

index bb7bb47..30e561f 100644
@@ -366,7 +366,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CONFIG_MIIM_ADDRESS	(CONFIG_SYS_CCSRBAR + 0x82120)
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME         "FSL UEC0"
+#define CONFIG_ETHPRIME         "UEC0"
 #define CONFIG_PHY_MODE_NEED_CHANGE
 
 #define CONFIG_UEC_ETH1         /* GETH1 */

include/configs/kmeter1.h +1 -1

index 6497231..f7d36b1 100644
@@ -284,7 +284,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1

Signature · 1 line

1.7.1.1

Ben Warren

Applied

2010-07-29 17:47 UTC #1 lore raw

PATCH 1/1 net: rename "FSL UECx" net interfaces "UECx"

Hi Kim,

Quoted 6 lines · Kim Phillips

continuation of commit 2ecc2262d66a286e3aac79005bcb5f461312dea8 "net ppc: fix ethernet device names with spaces" (currently in u-boot-net.git) for QE based parts.
Signed-off-by Kim Phillips<[email protected]>
---

Applied to net repo.

thanks,
Ben