aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-14 10:44:56 +0200
committerFelix Fietkau <nbd@nbd.name>2016-06-14 10:45:10 +0200
commit7c02ecdd35c2b0e4e486e3be816cae2490b7c402 (patch)
tree6edd9f1ba759a2a4d5304a0e5f56bb9042ca4873 /target/linux/ar71xx/files/drivers
parent9b4f17593ad3fcfbbb7e69036ce79187424caaaa (diff)
downloadupstream-7c02ecdd35c2b0e4e486e3be816cae2490b7c402.tar.gz
upstream-7c02ecdd35c2b0e4e486e3be816cae2490b7c402.tar.bz2
upstream-7c02ecdd35c2b0e4e486e3be816cae2490b7c402.zip
Revert "ar71xx: enable flow control for ethernet MACs with built-in switch"
This reverts commit 1beb5bec6453abb220c5be4ddb9e6dc02d08d735. It was found to cause the WAN port to fail on some AR934x devices Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx/files/drivers')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index d5253609cd..38226cf22e 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -453,17 +453,9 @@ static void ag71xx_hw_stop(struct ag71xx *ag)
static void ag71xx_hw_setup(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
- struct ag71xx_mdio_platform_data *mpdata;
- u32 init = MAC_CFG1_INIT;
-
- if (pdata->mii_bus_dev && ag->pdev->id == 0) {
- mpdata = pdata->mii_bus_dev->platform_data;
- if (mpdata && mpdata->builtin_switch)
- init |= MAC_CFG1_TFC | MAC_CFG1_RFC;
- }
/* setup MAC configuration registers */
- ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, init);
+ ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);