aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-11-13 11:26:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-11-13 11:26:56 +0000
commit9579bb426798fca0442bd5a3f03dfb89c928ee27 (patch)
tree1fee6ea8206b5c155ee472da4c1fb702fa0d70fa
parentda64ce860342dd0c920cbf5a91bb4ecc7f70c236 (diff)
downloadupstream-9579bb426798fca0442bd5a3f03dfb89c928ee27.tar.gz
upstream-9579bb426798fca0442bd5a3f03dfb89c928ee27.tar.bz2
upstream-9579bb426798fca0442bd5a3f03dfb89c928ee27.zip
ar71xx: ag71xx: remove MII interface setup code
SVN-Revision: 29011
-rw-r--r--target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h1
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h12
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c3
3 files changed, 0 insertions, 16 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
index 0d9b5d2345..2a61d05976 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
@@ -23,7 +23,6 @@ struct ag71xx_platform_data {
int speed;
int duplex;
u32 reset_bit;
- u32 mii_if;
u8 mac_addr[ETH_ALEN];
struct device *mii_bus_dev;
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 1076d3c04e..5757e60ac1 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -343,7 +343,6 @@ static inline int ag71xx_desc_pktlen(struct ag71xx_desc *desc)
#define RX_STATUS_OF BIT(2) /* Rx Overflow */
#define RX_STATUS_BE BIT(3) /* Bus Error */
-#define MII_CTRL_IF_MASK 3
#define MII_CTRL_SPEED_SHIFT 4
#define MII_CTRL_SPEED_MASK 3
#define MII_CTRL_SPEED_10 0
@@ -436,17 +435,6 @@ static inline u32 ag71xx_mii_ctrl_rr(struct ag71xx *ag)
return __raw_readl(ag->mii_ctrl);
}
-static inline void ag71xx_mii_ctrl_set_if(struct ag71xx *ag,
- unsigned int mii_if)
-{
- u32 t;
-
- t = ag71xx_mii_ctrl_rr(ag);
- t &= ~(MII_CTRL_IF_MASK);
- t |= (mii_if & MII_CTRL_IF_MASK);
- ag71xx_mii_ctrl_wr(ag, t);
-}
-
static inline void ag71xx_mii_ctrl_set_speed(struct ag71xx *ag,
unsigned int speed)
{
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index c541933cec..2ba0150f43 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -444,9 +444,6 @@ static void ag71xx_hw_setup(struct ag71xx *ag)
/* setup max frame length */
ag71xx_wr(ag, AG71XX_REG_MAC_MFL, AG71XX_TX_MTU_LEN);
- /* setup MII interface type */
- ag71xx_mii_ctrl_set_if(ag, pdata->mii_if);
-
/* setup FIFO configuration registers */
ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
if (pdata->is_ar724x) {