git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
arm
/
mach-omap2
/
clock.c
diff --git
a/arch/arm/mach-omap2/clock.c
b/arch/arm/mach-omap2/clock.c
index
d1b648a
..
72eb4bf
100644
(file)
--- a/
arch/arm/mach-omap2/clock.c
+++ b/
arch/arm/mach-omap2/clock.c
@@
-15,6
+15,7
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/device.h>
@@
-659,35
+660,26
@@
static int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
/* Isolate control register */
div_sel = (SRC_RATE_SEL_MASK & clk->flags);
/* Isolate control register */
div_sel = (SRC_RATE_SEL_MASK & clk->flags);
- div_off = clk->
rate
_offset;
+ div_off = clk->
src
_offset;
validrate = omap2_clksel_round_rate(clk, rate, &new_div);
validrate = omap2_clksel_round_rate(clk, rate, &new_div);
- if
(validrate != rate)
+ if(validrate != rate)
return(ret);
field_val = omap2_get_clksel(&div_sel, &field_mask, clk);
if (div_sel == 0)
return ret;
return(ret);
field_val = omap2_get_clksel(&div_sel, &field_mask, clk);
if (div_sel == 0)
return ret;
- if (clk->flags & CM_SYSCLKOUT_SEL1) {
- switch (new_div) {
- case 16:
- field_val = 4;
- break;
- case 8:
- field_val = 3;
- break;
- case 4:
- field_val = 2;
- break;
- case 2:
- field_val = 1;
- break;
- case 1:
- field_val = 0;
- break;
+ if(clk->flags & CM_SYSCLKOUT_SEL1){
+ switch(new_div){
+ case 16: field_val = 4; break;
+ case 8: field_val = 3; break;
+ case 4: field_val = 2; break;
+ case 2: field_val = 1; break;
+ case 1: field_val = 0; break;
}
}
- } else
+ }
+ else
field_val = new_div;
reg = (void __iomem *)div_sel;
field_val = new_div;
reg = (void __iomem *)div_sel;
@@
-752,7
+744,7
@@
static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,
val = 0x2;
break;
case CM_WKUP_SEL1:
val = 0x2;
break;
case CM_WKUP_SEL1:
- src_reg_addr = (u32)&CM_CLKSEL
_WKUP
;
+ src_reg_addr = (u32)&CM_CLKSEL
2_CORE
;
mask = 0x3;
if (src_clk == &func_32k_ck)
val = 0x0;
mask = 0x3;
if (src_clk == &func_32k_ck)
val = 0x0;
@@
-792,9
+784,9
@@
static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,
val = 0;
if (src_clk == &sys_ck)
val = 1;
val = 0;
if (src_clk == &sys_ck)
val = 1;
- if (src_clk == &func_96m_ck)
- val = 2;
if (src_clk == &func_54m_ck)
if (src_clk == &func_54m_ck)
+ val = 2;
+ if (src_clk == &func_96m_ck)
val = 3;
break;
}
val = 3;
break;
}