diff options
| author | Joshua Primero <jprimero@nvidia.com> | 2012-10-20 12:54:16 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-10-31 19:18:35 -0700 |
| commit | 4e89c51ebe2393a14697e119c54ef102fa3e9a0c (patch) | |
| tree | 2f5cf0606420633a3e114060c770e01021fe06f3 /arch | |
| parent | a878b8d0acd40acead3834760b4f3550f09e71e9 (diff) | |
ARM: tegra: soctherm: set initial soctherm values
Set initial soctherm values. This is in preparation for enabling
the hardware.
Change-Id: Id7ad43b39ede0177a3916b9210b7a2e4fbd6eaa6
Signed-off-by: Joshua Primero <jprimero@nvidia.com>
Reviewed-on: http://git-master/r/146156
(cherry picked from commit d7cd52519608dd2273105be03a2aab4967f5a3bb)
Reviewed-on: http://git-master/r/159499
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore-power.c | 27 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-pluto-power.c | 27 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra11_soctherm.c | 2 |
3 files changed, 1 insertions, 55 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-power.c b/arch/arm/mach-tegra/board-dalmore-power.c index 9415f2835b18..5668a1d7df87 100644 --- a/arch/arm/mach-tegra/board-dalmore-power.c +++ b/arch/arm/mach-tegra/board-dalmore-power.c @@ -1230,33 +1230,6 @@ static struct soctherm_platform_data dalmore_soctherm_data = { .pdiv = 10, }, }, - - .therm = { - [THERM_CPU] = { - .thermtrip = 90, /* in C */ - .hw_backstop = 37, /* in C */ - - .trip_temp = 68000, /* in mC */ - .tc1 = 0, - .tc2 = 1, - .passive_delay = 2000, - }, - }, - - .throttle = { - [THROTTLE_HEAVY] = { - .priority = 1, - .devs = { - [THROTTLE_DEV_CPU] = { - .enable = true, - .dividend = 1, - .divisor = 255, - .step = 0, - .duration = 65535, - }, - }, - }, - }, }; static struct balanced_throttle tj_throttle = { diff --git a/arch/arm/mach-tegra/board-pluto-power.c b/arch/arm/mach-tegra/board-pluto-power.c index d36bb68043db..ccbae4d6de59 100644 --- a/arch/arm/mach-tegra/board-pluto-power.c +++ b/arch/arm/mach-tegra/board-pluto-power.c @@ -790,33 +790,6 @@ static struct soctherm_platform_data pluto_soctherm_data = { .pdiv = 10, }, }, - - .therm = { - [THERM_CPU] = { - .thermtrip = 90, /* in C */ - .hw_backstop = 37, /* in C */ - - .trip_temp = 68000, /* in mC */ - .tc1 = 0, - .tc2 = 1, - .passive_delay = 2000, - }, - }, - - .throttle = { - [THROTTLE_HEAVY] = { - .priority = 1, - .devs = { - [THROTTLE_DEV_CPU] = { - .enable = true, - .dividend = 1, - .divisor = 255, - .step = 0, - .duration = 65535, - }, - }, - }, - }, }; static struct balanced_throttle tj_throttle = { diff --git a/arch/arm/mach-tegra/tegra11_soctherm.c b/arch/arm/mach-tegra/tegra11_soctherm.c index cbab6d18cf1a..ab4e90f5a01c 100644 --- a/arch/arm/mach-tegra/tegra11_soctherm.c +++ b/arch/arm/mach-tegra/tegra11_soctherm.c @@ -645,7 +645,7 @@ int __init tegra11_soctherm_init(struct soctherm_platform_data *data) /* Enable Level 0 */ r = soctherm_readl(CTL_LVL0_CPU0); - r = REG_SET(r, CTL_LVL0_CPU0_EN, 1); + r = REG_SET(r, CTL_LVL0_CPU0_EN, !!therm[THERM_CPU].trip_temp); soctherm_writel(r, CTL_LVL0_CPU0); /* Thermtrip */ |