summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-01-19 03:36:40 -0600
committerWolfgang Denk <wd@denx.de>2011-01-25 21:15:10 +0100
commit2b21ec92afd8f1809d55beb6044d9faabb4acae1 (patch)
tree4dfa71f45181491c2279a3cc6af860c9a90d67b8 /drivers
parent5aebe3b07254d9ec8f7ae23a4525a6c535a7f858 (diff)
downloadu-boot-imx-2b21ec92afd8f1809d55beb6044d9faabb4acae1.zip
u-boot-imx-2b21ec92afd8f1809d55beb6044d9faabb4acae1.tar.gz
u-boot-imx-2b21ec92afd8f1809d55beb6044d9faabb4acae1.tar.bz2
UEC: Fix compiler warnings introduced by linux/mii.h change
Patch 8ef583a0 [miiphy: convert to linux/mii.h] introduced the following compiler warnings in the uec ethernet driver: In file included from /local/home/galak/git/u-boot-85xx/include/miiphy.h:37:0, from uec.c:32: /local/home/galak/git/u-boot-85xx/include/linux/mii.h:133:0: warning: "LPA_1000FULL" redefined uec_phy.h:34:0: note: this is the location of the previous definition /local/home/galak/git/u-boot-85xx/include/linux/mii.h:134:0: warning: "LPA_1000HALF" redefined uec_phy.h:35:0: note: this is the location of the previous definition In file included from /local/home/galak/git/u-boot-85xx/include/miiphy.h:37:0, from uec_phy.c:27: /local/home/galak/git/u-boot-85xx/include/linux/mii.h:133:0: warning: "LPA_1000FULL" redefined uec_phy.h:34:0: note: this is the location of the previous definition /local/home/galak/git/u-boot-85xx/include/linux/mii.h:134:0: warning: "LPA_1000HALF" redefined uec_phy.h:35:0: note: this is the location of the previous definition Fix them be removing the duplication in the uec code and utlizing the linux/mii.h version instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/qe/uec_phy.c16
-rw-r--r--drivers/qe/uec_phy.h12
2 files changed, 9 insertions, 19 deletions
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index 465a497..55c2622 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005,2010 Freescale Semiconductor, Inc.
+ * Copyright (C) 2005,2010-2011 Freescale Semiconductor, Inc.
*
* Author: Shlomi Gridish
*
@@ -313,14 +313,14 @@ static int gbit_config_aneg (struct uec_mii_info *mii_info)
config_genmii_advert (mii_info);
advertise = mii_info->advertising;
- adv = phy_read (mii_info, MII_1000BASETCONTROL);
- adv &= ~(MII_1000BASETCONTROL_FULLDUPLEXCAP |
- MII_1000BASETCONTROL_HALFDUPLEXCAP);
+ adv = phy_read (mii_info, MII_CTRL1000);
+ adv &= ~(ADVERTISE_1000FULL |
+ ADVERTISE_1000HALF);
if (advertise & SUPPORTED_1000baseT_Half)
- adv |= MII_1000BASETCONTROL_HALFDUPLEXCAP;
+ adv |= ADVERTISE_1000HALF;
if (advertise & SUPPORTED_1000baseT_Full)
- adv |= MII_1000BASETCONTROL_FULLDUPLEXCAP;
- phy_write (mii_info, MII_1000BASETCONTROL, adv);
+ adv |= ADVERTISE_1000FULL;
+ phy_write (mii_info, MII_CTRL1000, adv);
/* Start/Restart aneg */
genmii_restart_aneg (mii_info);
@@ -420,7 +420,7 @@ static int genmii_read_status (struct uec_mii_info *mii_info)
return err;
if (mii_info->autoneg) {
- status = phy_read(mii_info, MII_1000BASETSTATUS);
+ status = phy_read(mii_info, MII_STAT1000);
if (status & (LPA_1000FULL | LPA_1000HALF)) {
mii_info->speed = SPEED_1000;
diff --git a/drivers/qe/uec_phy.h b/drivers/qe/uec_phy.h
index 929d9bd..f924b2a 100644
--- a/drivers/qe/uec_phy.h
+++ b/drivers/qe/uec_phy.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 Freescale Semiconductor, Inc.
+ * Copyright (C) 2005, 2011 Freescale Semiconductor, Inc.
*
* Author: Shlomi Gridish <gridish@freescale.com>
*
@@ -24,16 +24,6 @@
#define UGETH_AN_TIMEOUT 2000
-/* 1000BT control (Marvell & BCM54xx at least) */
-#define MII_1000BASETCONTROL 0x09
-#define MII_1000BASETCONTROL_FULLDUPLEXCAP 0x0200
-#define MII_1000BASETCONTROL_HALFDUPLEXCAP 0x0100
-
-/* 1000BT status */
-#define MII_1000BASETSTATUS 0x0a
-#define LPA_1000FULL 0x0400
-#define LPA_1000HALF 0x0200
-
/* Cicada Extended Control Register 1 */
#define MII_CIS8201_EXT_CON1 0x17
#define MII_CIS8201_EXTCON1_INIT 0x0000