|
@@ -658,12 +658,7 @@ static void __init clocks_init(void)
|
|
osc = clk_get(NULL, "osc_ck");
|
|
osc = clk_get(NULL, "osc_ck");
|
|
else
|
|
else
|
|
osc = clk_get(NULL, "osc_sys_ck");
|
|
osc = clk_get(NULL, "osc_sys_ck");
|
|
-#else
|
|
|
|
- /* REVISIT for non-OMAP systems, pass the clock rate from
|
|
|
|
- * board init code, using platform_data.
|
|
|
|
- */
|
|
|
|
- osc = ERR_PTR(-EIO);
|
|
|
|
-#endif
|
|
|
|
|
|
+
|
|
if (IS_ERR(osc)) {
|
|
if (IS_ERR(osc)) {
|
|
printk(KERN_WARNING "Skipping twl4030 internal clock init and "
|
|
printk(KERN_WARNING "Skipping twl4030 internal clock init and "
|
|
"using bootloader value (unknown osc rate)\n");
|
|
"using bootloader value (unknown osc rate)\n");
|
|
@@ -673,6 +668,18 @@ static void __init clocks_init(void)
|
|
rate = clk_get_rate(osc);
|
|
rate = clk_get_rate(osc);
|
|
clk_put(osc);
|
|
clk_put(osc);
|
|
|
|
|
|
|
|
+#else
|
|
|
|
+ /* REVISIT for non-OMAP systems, pass the clock rate from
|
|
|
|
+ * board init code, using platform_data.
|
|
|
|
+ */
|
|
|
|
+ osc = ERR_PTR(-EIO);
|
|
|
|
+
|
|
|
|
+ printk(KERN_WARNING "Skipping twl4030 internal clock init and "
|
|
|
|
+ "using bootloader value (unknown osc rate)\n");
|
|
|
|
+
|
|
|
|
+ return;
|
|
|
|
+#endif
|
|
|
|
+
|
|
switch (rate) {
|
|
switch (rate) {
|
|
case 19200000:
|
|
case 19200000:
|
|
ctrl = HFCLK_FREQ_19p2_MHZ;
|
|
ctrl = HFCLK_FREQ_19p2_MHZ;
|