diff options
Diffstat (limited to 'drivers/mfd')
-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 074b11ffbf41..e7ab0035d305 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c | |||
@@ -649,7 +649,7 @@ static inline int __init unprotect_pm_master(void) | |||
649 | return e; | 649 | return e; |
650 | } | 650 | } |
651 | 651 | ||
652 | static void __init clocks_init(void) | 652 | static void __init clocks_init(struct device *dev) |
653 | { | 653 | { |
654 | int e = 0; | 654 | int e = 0; |
655 | struct clk *osc; | 655 | struct clk *osc; |
@@ -658,9 +658,9 @@ static void __init clocks_init(void) | |||
658 | 658 | ||
659 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 659 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
660 | if (cpu_is_omap2430()) | 660 | if (cpu_is_omap2430()) |
661 | osc = clk_get(NULL, "osc_ck"); | 661 | osc = clk_get(dev, "osc_ck"); |
662 | else | 662 | else |
663 | osc = clk_get(NULL, "osc_sys_ck"); | 663 | osc = clk_get(dev, "osc_sys_ck"); |
664 | 664 | ||
665 | if (IS_ERR(osc)) { | 665 | if (IS_ERR(osc)) { |
666 | printk(KERN_WARNING "Skipping twl4030 internal clock init and " | 666 | printk(KERN_WARNING "Skipping twl4030 internal clock init and " |
@@ -776,7 +776,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
776 | inuse = true; | 776 | inuse = true; |
777 | 777 | ||
778 | /* setup clock framework */ | 778 | /* setup clock framework */ |
779 | clocks_init(); | 779 | clocks_init(&client->dev); |
780 | 780 | ||
781 | /* Maybe init the T2 Interrupt subsystem */ | 781 | /* Maybe init the T2 Interrupt subsystem */ |
782 | if (client->irq | 782 | if (client->irq |