diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-12 20:38:57 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-12 20:38:57 +0000 |
| commit | 8b2b37ae584238085d23c30163b96abf447846e4 (patch) | |
| tree | 0cdf76190cbbcd4f78203282c643437653c03357 /target/linux | |
| parent | b0bb0793b9bf20611f5347d74c802b40da05cb93 (diff) | |
| download | upstream-8b2b37ae584238085d23c30163b96abf447846e4.tar.gz upstream-8b2b37ae584238085d23c30163b96abf447846e4.tar.bz2 upstream-8b2b37ae584238085d23c30163b96abf447846e4.zip | |
ar71xx: merge ar934x_bo_ddr_flush patch
SVN-Revision: 30912
Diffstat (limited to 'target/linux')
3 files changed, 5 insertions, 110 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 27c8a40b60..557457f196 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -331,6 +331,10 @@ static void ar934x_set_speed_ge1(int speed) /* TODO */ } +static void ath79_ddr_no_flush(void) +{ +} + static void ath79_ddr_flush_ge0(void) { ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_GE0); @@ -371,16 +375,6 @@ static void ar933x_ddr_flush_ge1(void) ath79_ddr_wb_flush(AR933X_DDR_REG_FLUSH_GE1); } -static void ar934x_ddr_flush_ge0(void) -{ - ath79_ddr_wb_flush(AR934X_DDR_REG_FLUSH_GE0); -} - -static void ar934x_ddr_flush_ge1(void) -{ - ath79_ddr_wb_flush(AR934X_DDR_REG_FLUSH_GE1); -} - static struct resource ath79_eth0_resources[] = { { .name = "mac_base", @@ -817,17 +811,16 @@ void __init ath79_register_eth(unsigned int id) if (id == 0) { pdata->reset_bit = AR934X_RESET_GE0_MAC | AR934X_RESET_GE0_MDIO; - pdata->ddr_flush =ar934x_ddr_flush_ge0; pdata->set_speed = ar934x_set_speed_ge0; } else { pdata->reset_bit = AR934X_RESET_GE1_MAC | AR934X_RESET_GE1_MDIO; - pdata->ddr_flush = ar934x_ddr_flush_ge1; pdata->set_speed = ar934x_set_speed_ge1; pdata->switch_data = &ath79_switch_data; } + pdata->ddr_flush = ath79_ddr_no_flush; pdata->has_gbit = 1; pdata->is_ar724x = 1; diff --git a/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch b/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch deleted file mode 100644 index c405a75247..0000000000 --- a/target/linux/ar71xx/patches-3.2/710-ar934x_no_ddr_flush.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/arch/mips/ath79/dev-eth.c -+++ b/arch/mips/ath79/dev-eth.c -@@ -331,6 +331,10 @@ static void ar934x_set_speed_ge1(int spe - /* TODO */ - } - -+static void ath79_ddr_no_flush(void) -+{ -+} -+ - static void ath79_ddr_flush_ge0(void) - { - ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_GE0); -@@ -371,16 +375,6 @@ static void ar933x_ddr_flush_ge1(void) - ath79_ddr_wb_flush(AR933X_DDR_REG_FLUSH_GE1); - } - --static void ar934x_ddr_flush_ge0(void) --{ -- ath79_ddr_wb_flush(AR934X_DDR_REG_FLUSH_GE0); --} -- --static void ar934x_ddr_flush_ge1(void) --{ -- ath79_ddr_wb_flush(AR934X_DDR_REG_FLUSH_GE1); --} -- - static struct resource ath79_eth0_resources[] = { - { - .name = "mac_base", -@@ -817,17 +811,16 @@ void __init ath79_register_eth(unsigned - if (id == 0) { - pdata->reset_bit = AR934X_RESET_GE0_MAC | - AR934X_RESET_GE0_MDIO; -- pdata->ddr_flush =ar934x_ddr_flush_ge0; - pdata->set_speed = ar934x_set_speed_ge0; - } else { - pdata->reset_bit = AR934X_RESET_GE1_MAC | - AR934X_RESET_GE1_MDIO; -- pdata->ddr_flush = ar934x_ddr_flush_ge1; - pdata->set_speed = ar934x_set_speed_ge1; - - pdata->switch_data = &ath79_switch_data; - } - -+ pdata->ddr_flush = ath79_ddr_no_flush; - pdata->has_gbit = 1; - pdata->is_ar724x = 1; - diff --git a/target/linux/ar71xx/patches-3.3/710-ar934x_no_ddr_flush.patch b/target/linux/ar71xx/patches-3.3/710-ar934x_no_ddr_flush.patch deleted file mode 100644 index c405a75247..0000000000 --- a/target/linux/ar71xx/patches-3.3/710-ar934x_no_ddr_flush.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/arch/mips/ath79/dev-eth.c -+++ b/arch/mips/ath79/dev-eth.c -@@ -331,6 +331,10 @@ static void ar934x_set_speed_ge1(int spe - /* TODO */ - } - -+static void ath79_ddr_no_flush(void) -+{ -+} -+ - static void ath79_ddr_flush_ge0(void) - { - ath79_ddr_wb_flush(AR71XX_DDR_REG_FLUSH_GE0); -@@ -371,16 +375,6 @@ static void ar933x_ddr_flush_ge1(void) - ath79_ddr_wb_flush(AR933X_DDR_REG_FLUSH_GE1); - } - --static void ar934x_ddr_flush_ge0(void) --{ -- ath79_ddr_wb_flush(AR934X_DDR_REG_FLUSH_GE0); --} -- --static void ar934x_ddr_flush_ge1(void) --{ -- ath79_ddr_wb_flush(AR934X_DDR_REG_FLUSH_GE1); --} -- - static struct resource ath79_eth0_resources[] = { - { - .name = "mac_base", -@@ -817,17 +811,16 @@ void __init ath79_register_eth(unsigned - if (id == 0) { - pdata->reset_bit = AR934X_RESET_GE0_MAC | - AR934X_RESET_GE0_MDIO; -- pdata->ddr_flush =ar934x_ddr_flush_ge0; - pdata->set_speed = ar934x_set_speed_ge0; - } else { - pdata->reset_bit = AR934X_RESET_GE1_MAC | - AR934X_RESET_GE1_MDIO; -- pdata->ddr_flush = ar934x_ddr_flush_ge1; - pdata->set_speed = ar934x_set_speed_ge1; - - pdata->switch_data = &ath79_switch_data; - } - -+ pdata->ddr_flush = ath79_ddr_no_flush; - pdata->has_gbit = 1; - pdata->is_ar724x = 1; - |