ar71xx: ag71xx: remove MII interface setup code

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29011 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 0d9b5d2..2a61d05 100644 (file)
--- 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 1076d3c..5757e60 100644 (file)
--- 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 c541933..2ba0150 100644 (file)
--- 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) {