diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-06-23 08:08:39 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-06-23 08:08:39 -0700 |
| commit | 8fdc80c21f34a2171495e0714dbda57e7a29da47 (patch) | |
| tree | 879270c827a29fdbd49d27a6f9f8c2aa954ff97a /arch/arm/mach-omap2/pm.c | |
| parent | be1b78afbe1a2beb0f10b4ca285b82e6309f898f (diff) | |
| download | olio-linux-3.10-8fdc80c21f34a2171495e0714dbda57e7a29da47.tar.xz olio-linux-3.10-8fdc80c21f34a2171495e0714dbda57e7a29da47.zip | |
Sashas device tree and low power mods PLUS reintroducing to the board file those things that aren't yet in the DT.
Change-Id: I99853ac272380ae07a533d8f0c9dffff9478c684
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index b2dc18a6b82..b06b22c3f64 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -276,8 +276,6 @@ static inline void omap_init_cpufreq(void) devinfo.name = "omap-cpufreq"; else devinfo.name = "cpufreq-cpu0"; - - devinfo.name = "omap-cpufreq"; /* OLIO HACK */ platform_device_register_full(&devinfo); } @@ -311,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 */ |