|
@@ -646,7 +646,7 @@ static inline int __init unprotect_pm_master(void)
|
|
return e;
|
|
return e;
|
|
}
|
|
}
|
|
|
|
|
|
-static void __init clocks_init(void)
|
|
|
|
|
|
+static void __init clocks_init(struct device *dev)
|
|
{
|
|
{
|
|
int e = 0;
|
|
int e = 0;
|
|
struct clk *osc;
|
|
struct clk *osc;
|
|
@@ -655,9 +655,9 @@ static void __init clocks_init(void)
|
|
|
|
|
|
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
|
|
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
|
|
if (cpu_is_omap2430())
|
|
if (cpu_is_omap2430())
|
|
- osc = clk_get(NULL, "osc_ck");
|
|
|
|
|
|
+ osc = clk_get(dev, "osc_ck");
|
|
else
|
|
else
|
|
- osc = clk_get(NULL, "osc_sys_ck");
|
|
|
|
|
|
+ osc = clk_get(dev, "osc_sys_ck");
|
|
|
|
|
|
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 "
|
|
@@ -773,7 +773,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|
inuse = true;
|
|
inuse = true;
|
|
|
|
|
|
/* setup clock framework */
|
|
/* setup clock framework */
|
|
- clocks_init();
|
|
|
|
|
|
+ clocks_init(&client->dev);
|
|
|
|
|
|
/* Maybe init the T2 Interrupt subsystem */
|
|
/* Maybe init the T2 Interrupt subsystem */
|
|
if (client->irq
|
|
if (client->irq
|