ARM: tegra: power: Add LP1 cold low voltage parameter

Currently, if CONFIG_TEGRA_LP1_LOW_COREVOLTAGE is enabled,
we decrease core voltage to a level specified via lp1_core_volt_low
in each platform's board file.

Add another level, lp1_core_volt_low_cold, which will be used if
there's a low temperature core voltage floor set during LP1 entry.
Only one voltage floor exists for T30 and T114, so only one additional
low voltage entry has been added.

Bug 1261915

Change-Id: I614a4176b0bf68d6607a104a980d38589ebd3046
Signed-off-by: Daniel Solomon <daniels@nvidia.com>
Reviewed-on: http://git-master/r/216364
(cherry picked from commit b12e9b71552b89664dd8bdfc26e5e33cc9b45056)
Reviewed-on: http://git-master/r/226437
Reviewed-by: Mrutyunjay Sawant <msawant@nvidia.com>
Tested-by: Mrutyunjay Sawant <msawant@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-dalmore-power.c b/arch/arm/mach-tegra/board-dalmore-power.c
index c1861424e37ce330468eabe5de8f8e8edebfe2b1..3a92dcfc64f59da82c8cba96310b24328195cf9f 100644 (file)
--- a/arch/arm/mach-tegra/board-dalmore-power.c
+++ b/arch/arm/mach-tegra/board-dalmore-power.c
@@ -1096,6 +1096,7 @@ static struct tegra_suspend_platform_data dalmore_suspend_data = {
        .i2c_base_addr = 0,
        .pmuslave_addr = 0,
        .core_reg_addr = 0,
+       .lp1_core_volt_low_cold = 0,
        .lp1_core_volt_low = 0,
        .lp1_core_volt_high = 0,
 #endif

diff --git a/arch/arm/mach-tegra/board-macallan-power.c b/arch/arm/mach-tegra/board-macallan-power.c
index aab2da9348b1fda877a020b23ac920df36cb8527..56a31684f03006e88867b1f798f7d0fe08274f33 100644 (file)
--- a/arch/arm/mach-tegra/board-macallan-power.c
+++ b/arch/arm/mach-tegra/board-macallan-power.c
@@ -624,6 +624,7 @@ static struct tegra_suspend_platform_data macallan_suspend_data = {
        .i2c_base_addr = 0,
        .pmuslave_addr = 0,
        .core_reg_addr = 0,
+       .lp1_core_volt_low_cold = 0,
        .lp1_core_volt_low = 0,
        .lp1_core_volt_high = 0,
 #endif

diff --git a/arch/arm/mach-tegra/board-pluto-power.c b/arch/arm/mach-tegra/board-pluto-power.c
index 53a60f0c1b9a5e777de0de0b181dd157a1ab4183..99e1926c7888da1562c475b6788975bb2646de63 100644 (file)
--- a/arch/arm/mach-tegra/board-pluto-power.c
+++ b/arch/arm/mach-tegra/board-pluto-power.c
@@ -717,7 +717,8 @@ static struct tegra_suspend_platform_data pluto_suspend_data = {
        .i2c_base_addr = TEGRA_I2C5_BASE,
        .pmuslave_addr = 0xB0,
        .core_reg_addr = 0x2B,
-       .lp1_core_volt_low = 0x33,
+       .lp1_core_volt_low_cold = 0x33,
+       .lp1_core_volt_low = 0x2e,
        .lp1_core_volt_high = 0x42,
 #endif
 };

diff --git a/arch/arm/mach-tegra/board-roth-power.c b/arch/arm/mach-tegra/board-roth-power.c
index 23da2a60b4156880ee1b03d02766ba4ecb7df9dd..1fa17061315284b2d12a557c17f3a6e53e8b25c8 100644 (file)
--- a/arch/arm/mach-tegra/board-roth-power.c
+++ b/arch/arm/mach-tegra/board-roth-power.c
@@ -611,6 +611,7 @@ static struct tegra_suspend_platform_data roth_suspend_data = {
        .i2c_base_addr = 0,
        .pmuslave_addr = 0,
        .core_reg_addr = 0,
+       .lp1_core_volt_low_cold = 0,
        .lp1_core_volt_low = 0,
        .lp1_core_volt_high = 0,
 #endif

diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h
index e0b7106d06f515f3b79140f48a9a09e8adafcd8f..d34df30f6aa56dd438c3ec314fb8f53fa79b9d8f 100644 (file)
--- a/arch/arm/mach-tegra/pm.h
+++ b/arch/arm/mach-tegra/pm.h
@@ -71,6 +71,7 @@ struct tegra_suspend_platform_data {
        unsigned int i2c_base_addr;
        unsigned int pmuslave_addr;
        unsigned int core_reg_addr;
+       unsigned int lp1_core_volt_low_cold;
        unsigned int lp1_core_volt_low;
        unsigned int lp1_core_volt_high;
 #endif