Merge tag 'metag-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[karo-tx-linux.git] / arch / arm / mach-tegra / flowctrl.c

diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
index b477ef310dcd1781cab7df8b3c51eba950342e06..5348543382bfa292bded606815256e038281e75e 100644 (file)
--- a/arch/arm/mach-tegra/flowctrl.c
+++ b/arch/arm/mach-tegra/flowctrl.c
@@ -86,6 +86,7 @@ void flowctrl_cpu_suspend_enter(unsigned int cpuid)
                reg |= TEGRA20_FLOW_CTRL_CSR_WFE_CPU0 << cpuid;
                break;
        case TEGRA30:
+       case TEGRA114:
                /* clear wfe bitmap */
                reg &= ~TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP;
                /* clear wfi bitmap */
@@ -123,6 +124,7 @@ void flowctrl_cpu_suspend_exit(unsigned int cpuid)
                reg &= ~TEGRA20_FLOW_CTRL_CSR_WFI_BITMAP;
                break;
        case TEGRA30:
+       case TEGRA114:
                /* clear wfe bitmap */
                reg &= ~TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP;
                /* clear wfi bitmap */