diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 14a0008d0b9..f032b8e7e3b 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -91,6 +91,7 @@ #define LCD_RESET_GPIO 122 #endif + #define BACKLIGHT_PWM_GPIO 128 static struct of_device_id omap_dt_match_table[] __initdata = { @@ -479,6 +480,7 @@ static struct platform_device *omap3h1_devices[] __initdata = { static void __init omap3_h1_init(void) { + /* Read what we can from the device tree */ of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index b06b22c3f64..04ccc127e75 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -309,6 +309,7 @@ int __init omap2_common_pm_late_init(void) /* Smartreflex device init */ omap_devinit_smartreflex(); +#ifdef OLIO_TEST_GL_SUSPEND } else { struct device_node *np; np = of_find_node_by_name(NULL, "omap_pimic"); @@ -316,6 +317,7 @@ int __init omap2_common_pm_late_init(void) of_platform_populate(np, NULL, NULL, NULL); of_node_put(np); } +#endif /* OLIO_TEST_GL_SUSPEND */ } /* cpufreq dummy device instantiation */ |