diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index b59c385cbc12..4a488be91ed7 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c | |||
| @@ -646,7 +646,7 @@ static inline int __init unprotect_pm_master(void) | |||
| 646 | return e; | 646 | return e; |
| 647 | } | 647 | } |
| 648 | 648 | ||
| 649 | static void __init clocks_init(void) | 649 | static void __init clocks_init(struct device *dev) |
| 650 | { | 650 | { |
| 651 | int e = 0; | 651 | int e = 0; |
| 652 | struct clk *osc; | 652 | struct clk *osc; |
| @@ -655,9 +655,9 @@ static void __init clocks_init(void) | |||
| 655 | 655 | ||
| 656 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 656 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 657 | if (cpu_is_omap2430()) | 657 | if (cpu_is_omap2430()) |
| 658 | osc = clk_get(NULL, "osc_ck"); | 658 | osc = clk_get(dev, "osc_ck"); |
| 659 | else | 659 | else |
| 660 | osc = clk_get(NULL, "osc_sys_ck"); | 660 | osc = clk_get(dev, "osc_sys_ck"); |
| 661 | 661 | ||
| 662 | if (IS_ERR(osc)) { | 662 | if (IS_ERR(osc)) { |
| 663 | printk(KERN_WARNING "Skipping twl4030 internal clock init and " | 663 | 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) | |||
| 773 | inuse = true; | 773 | inuse = true; |
| 774 | 774 | ||
| 775 | /* setup clock framework */ | 775 | /* setup clock framework */ |
| 776 | clocks_init(); | 776 | clocks_init(&client->dev); |
| 777 | 777 | ||
| 778 | /* Maybe init the T2 Interrupt subsystem */ | 778 | /* Maybe init the T2 Interrupt subsystem */ |
| 779 | if (client->irq | 779 | if (client->irq |
