diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-05-03 09:12:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-05-03 09:12:19 +0000 |
| commit | 18c588a5709c913471a2b7378428893ee0524945 (patch) | |
| tree | 4b0ca393406e7b9ae56907336fa4cfc08394d8e5 /target | |
| parent | 30c43603456d8d68fbdfc535c6671607669ec3d7 (diff) | |
| download | upstream-18c588a5709c913471a2b7378428893ee0524945.tar.gz upstream-18c588a5709c913471a2b7378428893ee0524945.tar.bz2 upstream-18c588a5709c913471a2b7378428893ee0524945.zip | |
ar71xx: add an external reset callback for ar913x and use it in ath9k - should reduce the frequency of DMA stop failures
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36530
Diffstat (limited to 'target')
5 files changed, 36 insertions, 5 deletions
diff --git a/target/linux/ar71xx/patches-3.8/480-ar913x_wmac_external_reset.patch b/target/linux/ar71xx/patches-3.8/480-ar913x_wmac_external_reset.patch new file mode 100644 index 0000000000..9b704a3c47 --- /dev/null +++ b/target/linux/ar71xx/patches-3.8/480-ar913x_wmac_external_reset.patch @@ -0,0 +1,31 @@ +--- a/arch/mips/ath79/dev-wmac.c ++++ b/arch/mips/ath79/dev-wmac.c +@@ -44,7 +44,7 @@ static struct platform_device ath79_wmac + }, + }; + +-static void __init ar913x_wmac_setup(void) ++static int ar913x_wmac_reset(void) + { + /* reset the WMAC */ + ath79_device_reset_set(AR913X_RESET_AMBA2WMAC); +@@ -53,10 +53,19 @@ static void __init ar913x_wmac_setup(voi + ath79_device_reset_clear(AR913X_RESET_AMBA2WMAC); + mdelay(10); + ++ return 0; ++} ++ ++static void __init ar913x_wmac_setup(void) ++{ ++ ar913x_wmac_reset(); ++ + ath79_wmac_resources[0].start = AR913X_WMAC_BASE; + ath79_wmac_resources[0].end = AR913X_WMAC_BASE + AR913X_WMAC_SIZE - 1; + ath79_wmac_resources[1].start = ATH79_CPU_IRQ(2); + ath79_wmac_resources[1].end = ATH79_CPU_IRQ(2); ++ ++ ath79_wmac_data.external_reset = ar913x_wmac_reset; + } + + diff --git a/target/linux/ar71xx/patches-3.8/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch b/target/linux/ar71xx/patches-3.8/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch index de0db9a965..d9b8682f0d 100644 --- a/target/linux/ar71xx/patches-3.8/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch +++ b/target/linux/ar71xx/patches-3.8/501-MIPS-ath79-add-mac-argument-to-ath79_register_wmac.patch @@ -16,7 +16,7 @@ static struct ath9k_platform_data ath79_wmac_data; static struct resource ath79_wmac_resources[] = { -@@ -151,7 +153,7 @@ static void qca955x_wmac_setup(void) +@@ -160,7 +162,7 @@ static void qca955x_wmac_setup(void) ath79_wmac_data.is_clk_25mhz = true; } @@ -25,7 +25,7 @@ { if (soc_is_ar913x()) ar913x_wmac_setup(); -@@ -168,5 +170,10 @@ void __init ath79_register_wmac(u8 *cal_ +@@ -177,5 +179,10 @@ void __init ath79_register_wmac(u8 *cal_ memcpy(ath79_wmac_data.eeprom_data, cal_data, sizeof(ath79_wmac_data.eeprom_data)); diff --git a/target/linux/ar71xx/patches-3.8/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch b/target/linux/ar71xx/patches-3.8/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch index 74309b631f..74928e6835 100644 --- a/target/linux/ar71xx/patches-3.8/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch +++ b/target/linux/ar71xx/patches-3.8/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/dev-wmac.c +++ b/arch/mips/ath79/dev-wmac.c -@@ -180,3 +180,9 @@ void __init ath79_register_wmac(u8 *cal_ +@@ -189,3 +189,9 @@ void __init ath79_register_wmac(u8 *cal_ platform_device_register(&ath79_wmac_device); } diff --git a/target/linux/ar71xx/patches-3.8/523-MIPS-ath79-OTP-support.patch b/target/linux/ar71xx/patches-3.8/523-MIPS-ath79-OTP-support.patch index 84273d3d48..0672cf170d 100644 --- a/target/linux/ar71xx/patches-3.8/523-MIPS-ath79-OTP-support.patch +++ b/target/linux/ar71xx/patches-3.8/523-MIPS-ath79-OTP-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/dev-wmac.c +++ b/arch/mips/ath79/dev-wmac.c -@@ -156,6 +156,137 @@ static void qca955x_wmac_setup(void) +@@ -165,6 +165,137 @@ static void qca955x_wmac_setup(void) ath79_wmac_data.is_clk_25mhz = true; } diff --git a/target/linux/ar71xx/patches-3.8/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch b/target/linux/ar71xx/patches-3.8/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch index 8c6fd408fa..7b4b6ef284 100644 --- a/target/linux/ar71xx/patches-3.8/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch +++ b/target/linux/ar71xx/patches-3.8/524-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/dev-wmac.c +++ b/arch/mips/ath79/dev-wmac.c -@@ -287,6 +287,16 @@ bool __init ar93xx_wmac_read_mac_address +@@ -296,6 +296,16 @@ bool __init ar93xx_wmac_read_mac_address return ret; } |