[PATCHv2 16/19] TEMP: ARM: OMAP4: prevent voltage transitions
From: Tero Kristo <hidden>
Date: 2012-05-14 10:18:47
Also in:
linux-omap
Subsystem:
arm port, omap power management support, omap2+ support, the rest · Maintainers:
Russell King, Kevin Hilman, Aaro Koskinen, Andreas Kemnade, Roger Quadros, Tony Lindgren, Linus Torvalds
During device off, the off-mode voltage transitions are enabled on reset. Because the voltage control logic is not still completely functional for OMAP4, we must disable the voltage transitions for device off for now. This can only be done by disabling the I2C channel it seems. This patch does not prevent voltage scaling done by voltdm->scale / DVFS. Signed-off-by: Tero Kristo <redacted> --- arch/arm/mach-omap2/pm44xx.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index dfaa254..5d97b21 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c@@ -26,6 +26,9 @@ #include "clockdomain.h" #include "powerdomain.h" #include "pm.h" +#include "voltage.h" +#include "prm44xx.h" +#include "prm-regbits-44xx.h" #define EMIF_SDRAM_CONFIG2_OFFSET 0xc
@@ -210,6 +213,7 @@ static int __init omap4_pm_init(void) int ret; struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm, *l4wkup; struct clockdomain *ducati_clkdm, *l3_2_clkdm, *l4_per_clkdm; + struct voltagedomain *mpu_voltdm; if (!cpu_is_omap44xx()) return -ENODEV;
@@ -292,6 +296,24 @@ static int __init omap4_pm_init(void) goto err2; } + /* + * XXX: voltage config is not still completely valid for + * OMAP4, and this causes crashes on some platform during + * device off because voltage transitions for device off + * are enabled on reset. Thus, we have to disable the I2C + * channel completely in the VOLTCTRL register to avoid + * trouble. Remove this once voltconfigs are valid. + */ + mpu_voltdm = voltdm_lookup("mpu"); + if (!mpu_voltdm) { + pr_err("Failed to get MPU voltdm\n"); + goto err2; + } + mpu_voltdm->write(OMAP4430_VDD_MPU_I2C_DISABLE_MASK | + OMAP4430_VDD_CORE_I2C_DISABLE_MASK | + OMAP4430_VDD_IVA_I2C_DISABLE_MASK, + OMAP4_PRM_VOLTCTRL_OFFSET); + ret = omap4_mpuss_init(); if (ret) { pr_err("Failed to initialise OMAP4 MPUSS\n");
--
1.7.4.1