aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-03-25 08:50:09 +0000
committerJohn Crispin <blogic@openwrt.org>2012-03-25 08:50:09 +0000
commit62692a5350408bf5820e43b4d68150bf8ecac2d2 (patch)
treefcbc09d1188b157091e186d10871e28abf340864 /target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch
parent617f57c20a853957f6aa15611fff52ef410fc055 (diff)
downloadupstream-62692a5350408bf5820e43b4d68150bf8ecac2d2.tar.gz
upstream-62692a5350408bf5820e43b4d68150bf8ecac2d2.tar.bz2
upstream-62692a5350408bf5820e43b4d68150bf8ecac2d2.zip
[lantiq] bump kernel to 3.2.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31060 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch')
-rw-r--r--target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch b/target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch
deleted file mode 100644
index 1a9b6fcee7..0000000000
--- a/target/linux/lantiq/patches/840-fix-falcon-sysctrl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/arch/mips/lantiq/falcon/sysctrl.c
-+++ b/arch/mips/lantiq/falcon/sysctrl.c
-@@ -63,11 +63,11 @@ void __iomem *ltq_ebu_membase;
- #define ltq_status_r32(x) ltq_r32(ltq_status_membase + (x))
-
- static inline void
--ltq_sysctl_wait(int module, unsigned int mask, unsigned int test)
-+ltq_sysctl_wait(int module, unsigned int mask, unsigned int test, unsigned int reg)
- {
- int err = 1000000;
-
-- do {} while (--err && ((ltq_reg_r32(module, LTQ_SYSCTL_ACTS)
-+ do {} while (--err && ((ltq_reg_r32(module, reg)
- & mask) != test));
- if (!err)
- pr_err("module de/activation failed %d %08X %08X\n",
-@@ -82,7 +82,7 @@ ltq_sysctl_activate(int module, unsigned
-
- ltq_reg_w32(module, mask, LTQ_SYSCTL_CLKEN);
- ltq_reg_w32(module, mask, LTQ_SYSCTL_ACT);
-- ltq_sysctl_wait(module, mask, mask);
-+ ltq_sysctl_wait(module, mask, mask, LTQ_SYSCTL_ACTS);
- }
- EXPORT_SYMBOL(ltq_sysctl_activate);
-
-@@ -94,7 +94,7 @@ ltq_sysctl_deactivate(int module, unsign
-
- ltq_reg_w32(module, mask, LTQ_SYSCTL_CLKCLR);
- ltq_reg_w32(module, mask, LTQ_SYSCTL_DEACT);
-- ltq_sysctl_wait(module, mask, 0);
-+ ltq_sysctl_wait(module, mask, 0, LTQ_SYSCTL_ACTS);
- }
- EXPORT_SYMBOL(ltq_sysctl_deactivate);
-
-@@ -105,7 +105,7 @@ ltq_sysctl_clken(int module, unsigned in
- return;
-
- ltq_reg_w32(module, mask, LTQ_SYSCTL_CLKEN);
-- ltq_sysctl_wait(module, mask, mask);
-+ ltq_sysctl_wait(module, mask, mask, LTQ_SYSCTL_CLKS);
- }
- EXPORT_SYMBOL(ltq_sysctl_clken);
-
-@@ -116,7 +116,7 @@ ltq_sysctl_clkdis(int module, unsigned i
- return;
-
- ltq_reg_w32(module, mask, LTQ_SYSCTL_CLKCLR);
-- ltq_sysctl_wait(module, mask, 0);
-+ ltq_sysctl_wait(module, mask, 0, LTQ_SYSCTL_CLKS);
- }
- EXPORT_SYMBOL(ltq_sysctl_clkdis);
-
-@@ -132,7 +132,7 @@ ltq_sysctl_reboot(int module, unsigned i
- if ((~act & mask) != 0)
- ltq_sysctl_activate(module, ~act & mask);
- ltq_reg_w32(module, act & mask, LTQ_SYSCTL_RBT);
-- ltq_sysctl_wait(module, mask, mask);
-+ ltq_sysctl_wait(module, mask, mask, LTQ_SYSCTL_ACTS);
- }
- EXPORT_SYMBOL(ltq_sysctl_reboot);
-