Power savings - device tree was needed for some of the power changes, that's fixed. However, the OPPs from our board file did not get picked up when a device tree existed, so the opp.c and pm.c files had to be hacked a bit.

Change-Id: If3d6de76bb50ad79cbb10548b55cf7a7da6fb8e7

3 files changed, 13 insertions, 10 deletions

diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig
index 94035e8bef3..c480a53bd9a 100644
--- a/arch/arm/configs/omap3_h1_defconfig
+++ b/arch/arm/configs/omap3_h1_defconfig
@@ -89,7 +89,8 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_STALL_COMMON is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
@@ -538,7 +539,7 @@ CONFIG_PM_RUNTIME=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_HAS_OPP=y
@@ -972,6 +973,7 @@ CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_CMA is not set
@@ -1602,12 +1604,10 @@ CONFIG_BATTERY_BQ27X00_I2C=y
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET is not set
 # CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_POWER_RESET_MINNOW is not set
 CONFIG_POWER_AVS=y
-# CONFIG_POWER_TI_HARDWARE_VOLTAGE_CONTROL is not set
+CONFIG_POWER_TI_HARDWARE_VOLTAGE_CONTROL=y
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
 CONFIG_WATCHDOG=y
@@ -1692,10 +1692,9 @@ CONFIG_MFD_OMAP_USB_HOST=y
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TPS6586X is not set
 CONFIG_MFD_TPS65910=y
-CONFIG_MFD_TPS65912=y
+# CONFIG_MFD_TPS65912 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS65912_DEBUGFS is not set
 # CONFIG_MFD_TPS80031 is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
@@ -1714,7 +1713,7 @@ CONFIG_MFD_TPS65912=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_DUMMY=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
@@ -2389,7 +2388,7 @@ CONFIG_COMMON_CLK=y
 #
 # Common Clock Framework
 #
-# CONFIG_COMMON_CLK_DEBUG is not set
+CONFIG_COMMON_CLK_DEBUG=y
 # CONFIG_COMMON_CLK_SI5351 is not set
 
 #
diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c
index 82fd8c72f75..7149f838be4 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;
 
+    /* OLIO HACK
 	if (of_have_populated_dt())
 		return -EINVAL;
+     */
 
 	if (!opp_def || !opp_def_size) {
 		pr_err("%s: invalid params!\n", __func__);
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index b06b22c3f64..303a8d2012b 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -276,6 +276,8 @@ 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);
 }