Commit 0d81cf7e authored by Tony Lindgren's avatar Tony Lindgren

I2C: Fix twl4030 clock init

Without this patch twl4030 clock can get programmed to incorrect rate
which can eventually hang twl4030 reads. Also minor formatting fixes.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 039ced63
...@@ -672,11 +672,20 @@ static int power_companion_init(void) ...@@ -672,11 +672,20 @@ static int power_companion_init(void)
u32 rate, ctrl = HFCLK_FREQ_26_MHZ; u32 rate, ctrl = HFCLK_FREQ_26_MHZ;
int e = 0; int e = 0;
osc = clk_get(NULL,"osc_ck"); if (cpu_is_omap2430())
osc = clk_get(NULL, "osc_ck");
else
osc = clk_get(NULL, "osc_sys_ck");
if (IS_ERR(osc)) {
printk(KERN_ERR "Skipping twl3040 internal clock init and "
"using bootloader value (unknown osc rate)\n");
return 0;
}
rate = clk_get_rate(osc); rate = clk_get_rate(osc);
clk_put(osc); clk_put(osc);
switch(rate) { switch (rate) {
case 19200000 : ctrl = HFCLK_FREQ_19p2_MHZ; break; case 19200000 : ctrl = HFCLK_FREQ_19p2_MHZ; break;
case 26000000 : ctrl = HFCLK_FREQ_26_MHZ; break; case 26000000 : ctrl = HFCLK_FREQ_26_MHZ; break;
case 38400000 : ctrl = HFCLK_FREQ_38p4_MHZ; break; case 38400000 : ctrl = HFCLK_FREQ_38p4_MHZ; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment