aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-20 14:13:16 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-20 14:13:16 +0000
commite108cb91c092144cab7db0396023926a0aa7473c (patch)
treedf73febd8a009c5e3a9111dc69d6df44e9154785 /target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
parent5da1d7daa5e057f5073a72ae9e89f37426960e04 (diff)
downloadupstream-e108cb91c092144cab7db0396023926a0aa7473c.tar.gz
upstream-e108cb91c092144cab7db0396023926a0aa7473c.tar.bz2
upstream-e108cb91c092144cab7db0396023926a0aa7473c.zip
ar71xx: rename fix-ar933x-reset patch
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34798
Diffstat (limited to 'target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch')
-rw-r--r--target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch b/target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
new file mode 100644
index 0000000000..e0821a7776
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.6/213-MIPS-ath79-fix-ar933x-wmac-reset.patch
@@ -0,0 +1,31 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -62,10 +62,27 @@ static void __init ar913x_wmac_setup(voi
+
+ static int ar933x_wmac_reset(void)
+ {
++ int retries = 20;
++
+ ath79_device_reset_set(AR933X_RESET_WMAC);
+ ath79_device_reset_clear(AR933X_RESET_WMAC);
+
+- return 0;
++ while (1) {
++ u32 bootstrap;
++
++ bootstrap = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
++ if ((bootstrap & AR933X_BOOTSTRAP_EEPBUSY) == 0)
++ return 0;
++
++ if (retries-- == 0)
++ break;
++
++ udelay(10000);
++ retries++;
++ }
++
++ pr_err("ar933x: WMAC reset timed out");
++ return -ETIMEDOUT;
+ }
+
+ static int ar933x_r1_get_wmac_revision(void)