summaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-07-24 08:56:41 +0200
committerJohn Crispin <blogic@openwrt.org>2012-08-22 23:46:37 +0200
commit98dbc5764d8b6fa9cabe316fe725281703bf0fc6 (patch)
tree168580f5cfc992341931f30642106f1fc0d42f06 /arch/mips/lantiq
parentLinux 3.6-rc3 (diff)
downloadlinux-98dbc5764d8b6fa9cabe316fe725281703bf0fc6.tar.xz
linux-98dbc5764d8b6fa9cabe316fe725281703bf0fc6.zip
MIPS: lantiq: explicitly enable clkout generation
Previously we relied on the bootloader to have enabled this bit. However some bootloaders seem to not enable this for us. Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/4120/
Diffstat (limited to 'arch/mips/lantiq')
-rw-r--r--arch/mips/lantiq/xway/sysctrl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index befbb760ab76..8430983d3e70 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -187,10 +187,12 @@ static int clkout_enable(struct clk *clk)
for (i = 0; i < 4; i++) {
if (clk->rates[i] == clk->rate) {
int shift = 14 - (2 * clk->module);
+ int enable = 7 - clk->module;
unsigned int val = ltq_cgu_r32(ifccr);
val &= ~(3 << shift);
val |= i << shift;
+ val |= enable;
ltq_cgu_w32(val, ifccr);
return 0;
}