ARM: OMAP2+: Initialize voltage controller for omap4

We're missing initializing the PRM_VOLTCTRL register for voltage
controller. Let's add omap4_vc_init_pmic_signaling() similar to what we
have for omap3 and enable voltage control for retention.

This brings down droid4 power consumption with mainline kernel to somewhere
between 40 and 50mW from about 70 to 80 mW for the whole device when
running idle with LCD and backlight off, WLAN connected, and USB and modem
modules unloaded.

Mostly just rmmod of omap2430, ohci-platform and phy-mapphone-mdm6600 are
needed to idle USB and shut down the modem. And after that measuring idle
power consumption can be done with reading sysfs entry periodically
for /sys/class/power_supply/battery/power_avg. Then rmmod of phy-cpcap-usb
will save few more mW, but will disable the debug UART.

Note that sometimes CM_L4PER_UART1_CLKCTRL at 0x4a009540 does not idle
properly after unloading of phy-mapphone-mdm6600.

Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index d76b1e5eb8ba50ed9a09b0e1df3c56b1e2f0c6bb..3c94d1da4c8423ac23773967b171e2dc7afbe059 100644 (file)
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -26,6 +26,25 @@
 #include "scrm44xx.h"
 #include "control.h"
 
+#define OMAP4430_VDD_IVA_I2C_DISABLE           BIT(14)
+#define OMAP4430_VDD_MPU_I2C_DISABLE           BIT(13)
+#define OMAP4430_VDD_CORE_I2C_DISABLE          BIT(12)
+#define OMAP4430_VDD_IVA_PRESENCE              BIT(9)
+#define OMAP4430_VDD_MPU_PRESENCE              BIT(8)
+#define OMAP4430_AUTO_CTRL_VDD_IVA(x)          ((x) << 4)
+#define OMAP4430_AUTO_CTRL_VDD_MPU(x)          ((x) << 2)
+#define OMAP4430_AUTO_CTRL_VDD_CORE(x)         ((x) << 0)
+#define OMAP4430_AUTO_CTRL_VDD_RET             2
+
+#define OMAP4_VDD_DEFAULT_VAL  \
+       (OMAP4430_VDD_IVA_I2C_DISABLE | \
+        OMAP4430_VDD_MPU_I2C_DISABLE |  \
+        OMAP4430_VDD_CORE_I2C_DISABLE | \
+        OMAP4430_VDD_IVA_PRESENCE | OMAP4430_VDD_MPU_PRESENCE | \
+        OMAP4430_AUTO_CTRL_VDD_IVA(OMAP4430_AUTO_CTRL_VDD_RET) | \
+        OMAP4430_AUTO_CTRL_VDD_MPU(OMAP4430_AUTO_CTRL_VDD_RET) | \
+        OMAP4430_AUTO_CTRL_VDD_CORE(OMAP4430_AUTO_CTRL_VDD_RET))
+
 /**
  * struct omap_vc_channel_cfg - describe the cfg_channel bitfield
  * @sa: bit for slave address
@@ -542,9 +561,19 @@ static void omap4_set_timings(struct voltagedomain *voltdm, bool off_mode)
        writel_relaxed(val, OMAP4_SCRM_CLKSETUPTIME);
 }
 
+static void __init omap4_vc_init_pmic_signaling(struct voltagedomain *voltdm)
+{
+       if (vc.vd)
+               return;
+
+       vc.vd = voltdm;
+       voltdm->write(OMAP4_VDD_DEFAULT_VAL, OMAP4_PRM_VOLTCTRL_OFFSET);
+}
+
 /* OMAP4 specific voltage init functions */
 static void __init omap4_vc_init_channel(struct voltagedomain *voltdm)
 {
+       omap4_vc_init_pmic_signaling(voltdm);
        omap4_set_timings(voltdm, true);
        omap4_set_timings(voltdm, false);
 }