projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
da64ce8
)
ar71xx: ag71xx: remove MII interface setup code
author
Gabor Juhos
<juhosg@openwrt.org>
Sun, 13 Nov 2011 11:26:56 +0000
(11:26 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Sun, 13 Nov 2011 11:26:56 +0000
(11:26 +0000)
SVN-Revision: 29011
target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/platform.h
patch
|
blob
|
history
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
patch
|
blob
|
history
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
patch
|
blob
|
history
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 0d9b5d2345508c9e0891139f7b144bb60d863f4d..2a61d059764585e75ef68635eddbaf68070fa650 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;
int speed;
int duplex;
u32 reset_bit;
- u32 mii_if;
u8 mac_addr[ETH_ALEN];
struct device *mii_bus_dev;
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 1076d3c04e07cd20569aefd4ed63c257dcf5b8b4..5757e60ac15e7539a58251e0ed319e852b04f40b 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 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
#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);
}
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)
{
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 c541933cec53b638798d878b2df20c78e9dda833..2ba0150f43d1a10cc011b496acc5bf6cea3d3eb4 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 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) {
/* setup FIFO configuration registers */
ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
if (pdata->is_ar724x) {