4 files changed, 16 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 14a0008d0b9..ad40bd6d90e 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 = {
@@ -269,7 +270,7 @@ static struct omap_musb_board_data musb_board_data = {
 static struct nop_usb_xceiv_platform_data nop_plat_data = {
 	.type     = USB_PHY_TYPE_USB2,
 	.clk_rate = 60000000, /* 60 MHz */
-	.needs_vcc = 1,
+	.needs_vcc = 0,
 	.needs_reset = 0,
 };
 
@@ -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/opp.c b/arch/arm/mach-omap2/opp.c
index 82fd8c72f75..56e5ad35b17 100644
--- a/arch/arm/mach-omap2/opp.c
+++ b/arch/arm/mach-omap2/opp.c
@@ -41,8 +41,10 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
 {
 	int i, r;
 
+#ifndef CONFIG_MACH_OMAP3_H1 /* olio has a partial DT */
 	if (of_have_populated_dt())
 		return -EINVAL;
+#endif
 
 	if (!opp_def || !opp_def_size) {
 		pr_err("%s: invalid params!\n", __func__);
diff --git a/arch/arm/mach-omap2/opp3xxx_data.c b/arch/arm/mach-omap2/opp3xxx_data.c
index f715f6ffd1d..fcede945353 100644
--- a/arch/arm/mach-omap2/opp3xxx_data.c
+++ b/arch/arm/mach-omap2/opp3xxx_data.c
@@ -196,7 +196,7 @@ int __init omap3_opp_init(void)
 		return r;
 
 	if (cpu_is_omap3630())
-#ifdef CONFIG_MACH_OMAP3_H1_DVT2
+#ifdef CONFIG_MACH_OMAP3_H1
 		r = omap_init_opp_table(omap36xx_olioh1_opp_def_list,
 			ARRAY_SIZE(omap36xx_olioh1_opp_def_list));
 #else
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index b06b22c3f64..a6c441842cc 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -276,13 +276,20 @@ static inline void omap_init_cpufreq(void)
 		devinfo.name = "omap-cpufreq";
 	else
 		devinfo.name = "cpufreq-cpu0";
+
+	/* OLIO test - we want to use the omap driver. 
+	 * Will hardcoding this work? - YES, it does.
+	 */
+	devinfo.name = "omap-cpufreq";
+
 	platform_device_register_full(&devinfo);
 }
 
 static int __init omap2_common_pm_init(void)
 {
-	if (!of_have_populated_dt())
-		omap2_init_processor_devices();
+	/* if (!of_have_populated_dt()) OLIO TEST */
+	omap2_init_processor_devices();
+
 	omap_pm_if_init();
 
 	return 0;
@@ -296,6 +303,7 @@ int __init omap2_common_pm_late_init(void)
 	 * a completely different mechanism.
 	 * Disable this part if a DT blob is available.
 	 */
+
 	if (!of_have_populated_dt()) {
 
 		/* Init the voltage layer */
@@ -308,7 +316,6 @@ 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");