diff options
| -rw-r--r-- | arch/arm/mach-omap2/cclock3xxx_data.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c index 67d63082d7a..ec55d2acdc9 100644 --- a/arch/arm/mach-omap2/cclock3xxx_data.c +++ b/arch/arm/mach-omap2/cclock3xxx_data.c @@ -3541,6 +3541,9 @@ static struct omap_clk omap3xxx_clks[] = { CLK(NULL, "timer_sys_ck", &sys_ck), CLK(NULL, "cpufreq_ck", &dpll1_ck), CLK("cpufreq-cpu0.0", NULL, &dpll1_ck), + CLK("48307220.vc", NULL, &osc_sys_ck), + CLK("483072b0.vp", NULL, &osc_sys_ck), + CLK("4a307b40.vp", NULL, &osc_sys_ck), }; static const char *enable_init_clks[] = { diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index ce40d586464..f99dcf391e2 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -17,6 +17,7 @@ #include <linux/export.h> #include <linux/suspend.h> #include <linux/cpu.h> +#include <linux/of_platform.h> #include <asm/system_misc.h> @@ -308,6 +309,13 @@ int __init omap2_common_pm_late_init(void) /* Smartreflex device init */ omap_devinit_smartreflex(); + } else { + struct device_node *np; + np = of_find_node_by_name(NULL, "omap_pimic"); + if (np) { + of_platform_populate(np, NULL, NULL, NULL); + of_node_put(np); + } } /* cpufreq dummy device instantiation */ |