summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/tegra11_dvfs.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra11_dvfs.c b/arch/arm/mach-tegra/tegra11_dvfs.c
index 072a9ade160f..7490d2bcd1b6 100644
--- a/arch/arm/mach-tegra/tegra11_dvfs.c
+++ b/arch/arm/mach-tegra/tegra11_dvfs.c
@@ -34,6 +34,8 @@ static bool tegra_dvfs_core_disabled;
#define KHZ 1000
#define MHZ 1000000
+#define TEGRA11_CORE_VOLTAGE_CAP 1100
+
/* FIXME: need tegra11 step */
#define VDD_SAFE_STEP 100
@@ -636,11 +638,23 @@ static int __init get_core_nominal_mv_index(int speedo_id)
* Start with nominal level for the chips with this speedo_id. Then,
* make sure core nominal voltage is below edp limit for the board
* (if edp limit is set).
+ *
+ * Otherwise, leave nominal core voltage at chip bin level, and set
+ * all detach mode (boot, suspend, disable) limits same as boot edp
+ * (for now, still throttle nominal for other than T40T skus).
*/
+
if (!core_edp_voltage)
- core_edp_voltage = 1100; /* default 1.1V EDP limit */
+ core_edp_voltage = TEGRA11_CORE_VOLTAGE_CAP; /* default 1.1V EDP limit */
+
+ if ((core_edp_voltage <= TEGRA11_CORE_VOLTAGE_CAP) ||
+ (tegra_sku_id != 0x4))
+ mv = min(mv, core_edp_voltage);
- mv = min(mv, core_edp_voltage);
+ /* use boot edp limit as disable and suspend levels as well */
+ tegra11_dvfs_rail_vdd_core.boot_millivolts = core_edp_voltage;
+ tegra11_dvfs_rail_vdd_core.suspend_millivolts = core_edp_voltage;
+ tegra11_dvfs_rail_vdd_core.disable_millivolts = core_edp_voltage;
/* Round nominal level down to the nearest core scaling step */
for (i = 0; i < MAX_DVFS_FREQS; i++) {