aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-20 12:04:29 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-20 12:04:29 +0000
commit005fe5d1fde456b29fe89c9bbf8fc52c16c5f95f (patch)
tree0353b3cd6bc09bda57bd04712fdd77e5c417366a
parente7ab0000086a5cf63b27ef980cf4faf9241c4af5 (diff)
downloadupstream-005fe5d1fde456b29fe89c9bbf8fc52c16c5f95f.tar.gz
upstream-005fe5d1fde456b29fe89c9bbf8fc52c16c5f95f.tar.bz2
upstream-005fe5d1fde456b29fe89c9bbf8fc52c16c5f95f.zip
ar71xx: make sure that rx and interrupts are disabled before issuing the hardware reset
SVN-Revision: 27702
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c16
1 files changed, 9 insertions, 7 deletions
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 f0f4d2370a..c1143161af 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -423,10 +423,19 @@ static void ag71xx_dma_reset(struct ag71xx *ag)
FIFO_CFG5_LE | FIFO_CFG5_FT | FIFO_CFG5_16 | \
FIFO_CFG5_17 | FIFO_CFG5_SF)
+static void ag71xx_hw_stop(struct ag71xx *ag)
+{
+ /* disable all interrupts and stop the rx engine */
+ ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+ ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+}
+
static void ag71xx_hw_init(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+ ag71xx_hw_stop(ag);
+
ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
udelay(20);
@@ -471,13 +480,6 @@ static void ag71xx_hw_start(struct ag71xx *ag)
ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, AG71XX_INT_INIT);
}
-static void ag71xx_hw_stop(struct ag71xx *ag)
-{
- /* disable all interrupts and stop the rx engine */
- ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
- ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
-}
-
void ag71xx_link_adjust(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);