diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-09-19 19:27:19 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:56 -0800 |
| commit | 539401120ceff2241b4b8e90d8d80d6115fc3663 (patch) | |
| tree | 2a8cbceb5e0c3021d899c486c5987f64cd0b88b8 /arch/arm/mach-tegra/timer.c | |
| parent | c935351fa8f6f7fd2ebe2d93990b50e150fc1ef7 (diff) | |
ARM: tegra: timer: Fix mismatch in twd suspend/resume code
Change-Id: Ied49d7517574b62ebc54ba8a5ef04d26408f0145
Reviewed-on: http://git-master/r/53347
Tested-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com>
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Rebase-Id: Rd540ebbeb48903eea556508be45580c5d260941e
Diffstat (limited to 'arch/arm/mach-tegra/timer.c')
| -rw-r--r-- | arch/arm/mach-tegra/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c index 4c1d4ccca022..91136eb5279b 100644 --- a/arch/arm/mach-tegra/timer.c +++ b/arch/arm/mach-tegra/timer.c @@ -207,7 +207,7 @@ static struct syscore_ops tegra_timer_syscore_ops = { void tegra_twd_suspend(struct tegra_twd_context *context) { context->twd_ctrl = readl(twd_base + TWD_TIMER_CONTROL); - context->twd_load = readl(twd_base + TWD_TIMER_COUNTER); + context->twd_load = readl(twd_base + TWD_TIMER_LOAD); if ((context->twd_load == 0) && (context->twd_ctrl & (TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE))) { WARN("%s: TWD enabled but counter was 0\n", __func__); |