bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next

Browse Source
This commit is contained in:
Ralf Baechle
2012-10-05 15:56:28 +02:00
parent 97541ccfb9 986936d7c2
commit 382fc33b4a
24 changed files with 1045 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/lantiq/xway/sysctrl.c
View File

@@ -188,10 +188,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;
}