]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
arm: tegra: ardbeg: Fix pwr key wake sts reporting
authorKamal Kannan Balagopalan <kbalagopalan@nvidia.com>
Fri, 12 Jul 2013 23:40:29 +0000 (16:40 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 20:33:52 +0000 (13:33 -0700)
Incorrect wake status register was checked for power key press on
LP0 resume.

Bug 1321719

Reviewed-on: http://git-master/r/248813
(cherry picked from commit 16d4966676095954127f80602efd88aa19bfcd41)

Change-Id: Idbaf398d341b589b7bfec69b33ed6742107527f1
Signed-off-by: Kamal Kannan Balagopalan <kbalagopalan@nvidia.com>
Reviewed-on: http://git-master/r/250551
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mitch Luban <mluban@nvidia.com>
arch/arm/mach-tegra/board-ardbeg-kbc.c

index cb3dd52d029d637de1953399a14ead50e3fb4b4f..205e6ec5ef3633d6416c2ae41d18136edd6e8c2a 100644 (file)
@@ -62,8 +62,8 @@
                .debounce_interval = _deb,      \
        }
 
-#define PMC_WAKE_STATUS         0x14
-#define TEGRA_WAKE_PWR_INT      (1UL << 18)
+#define PMC_WAKE2_STATUS         0x160
+#define TEGRA_WAKE_PWR_INT      (1UL << 19)
 
 static int ardbeg_wakeup_key(void);
 
@@ -95,7 +95,7 @@ static struct platform_device ardbeg_int_keys_device = {
 static int ardbeg_wakeup_key(void)
 {
        u32 status;
-       status = __raw_readl(IO_ADDRESS(TEGRA_PMC_BASE) + PMC_WAKE_STATUS);
+       status = __raw_readl(IO_ADDRESS(TEGRA_PMC_BASE) + PMC_WAKE2_STATUS);
 
        pr_info("%s: Power key pressed\n", __func__);