aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-27 10:02:58 +0200
committerFelix Fietkau <nbd@nbd.name>2016-06-27 12:12:40 +0200
commit75b2105cd3ba07039abe43b8565e5ef54b60e3fa (patch)
tree52bc490d9e724db1170170346b3927603742f756 /target
parent8d1218ca7370a84c886a63917ef857c92ab9f25f (diff)
downloadupstream-75b2105cd3ba07039abe43b8565e5ef54b60e3fa.tar.gz
upstream-75b2105cd3ba07039abe43b8565e5ef54b60e3fa.tar.bz2
upstream-75b2105cd3ba07039abe43b8565e5ef54b60e3fa.zip
ar71xx: rename ethernet pdata->builtin_switch to use_flow_control
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c12
-rw-r--r--target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h2
-rw-r--r--target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
index 7d641d4f09..bdae999d5d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
@@ -907,7 +907,7 @@ void __init ath79_register_eth(unsigned int id)
pdata->speed = SPEED_1000;
pdata->duplex = DUPLEX_FULL;
pdata->switch_data = &ath79_switch_data;
- pdata->builtin_switch = 1;
+ pdata->use_flow_control = 1;
ath79_switch_data.phy_poll_mask |= BIT(4);
}
@@ -952,7 +952,7 @@ void __init ath79_register_eth(unsigned int id)
pdata->has_gbit = 1;
pdata->duplex = DUPLEX_FULL;
pdata->switch_data = &ath79_switch_data;
- pdata->builtin_switch = 1;
+ pdata->use_flow_control = 1;
ath79_switch_data.phy_poll_mask |= BIT(4);
}
@@ -981,7 +981,7 @@ void __init ath79_register_eth(unsigned int id)
pdata->set_speed = ath79_set_speed_dummy;
pdata->switch_data = &ath79_switch_data;
- pdata->builtin_switch = 1;
+ pdata->use_flow_control = 1;
/* reset the built-in switch */
ath79_device_reset_set(AR934X_RESET_ETH_SWITCH);
@@ -1018,7 +1018,7 @@ void __init ath79_register_eth(unsigned int id)
pdata->speed = SPEED_1000;
pdata->duplex = DUPLEX_FULL;
pdata->switch_data = &ath79_switch_data;
- pdata->builtin_switch = 1;
+ pdata->use_flow_control = 1;
ath79_switch_data.phy_poll_mask |= BIT(4);
}
@@ -1044,7 +1044,7 @@ void __init ath79_register_eth(unsigned int id)
pdata->reset_bit = QCA955X_RESET_GE1_MAC |
QCA955X_RESET_GE1_MDIO;
pdata->set_speed = qca955x_set_speed_sgmii;
- pdata->builtin_switch = 1;
+ pdata->use_flow_control = 1;
}
pdata->has_gbit = 1;
@@ -1088,7 +1088,7 @@ void __init ath79_register_eth(unsigned int id)
pdata->speed = SPEED_1000;
pdata->duplex = DUPLEX_FULL;
- pdata->builtin_switch = 1;
+ pdata->use_flow_control = 1;
/* reset the built-in switch */
ath79_device_reset_set(AR934X_RESET_ETH_SWITCH);
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
index e494cdfc0f..5fd352c638 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h
@@ -36,7 +36,7 @@ struct ag71xx_platform_data {
u8 is_ar7240:1;
u8 is_ar724x:1;
u8 has_ar8216:1;
- u8 builtin_switch:1;
+ u8 use_flow_control:1;
struct ag71xx_switch_platform_data *switch_data;
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 d7c27393a6..0ae6acf119 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
@@ -456,7 +456,7 @@ static void ag71xx_hw_setup(struct ag71xx *ag)
u32 init = MAC_CFG1_INIT;
/* setup MAC configuration registers */
- if (pdata->builtin_switch)
+ if (pdata->use_flow_control)
init |= MAC_CFG1_TFC | MAC_CFG1_RFC;
ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, init);