aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-exynos/suspend.c2
-rw-r--r--include/linux/soc/samsung/exynos-regs-pmu.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index d3db306a5a70..f3384e3a675d 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -272,7 +272,7 @@ static int exynos5420_cpu_suspend(unsigned long arg)
272static void exynos_pm_set_wakeup_mask(void) 272static void exynos_pm_set_wakeup_mask(void)
273{ 273{
274 /* Set wake-up mask registers */ 274 /* Set wake-up mask registers */
275 pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK); 275 pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);
276 pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); 276 pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
277} 277}
278 278
diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h
index 66dcb9ec273a..eb0d240df7a7 100644
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@ -42,7 +42,7 @@
42#define EXYNOS_SWRESET 0x0400 42#define EXYNOS_SWRESET 0x0400
43 43
44#define S5P_WAKEUP_STAT 0x0600 44#define S5P_WAKEUP_STAT 0x0600
45#define S5P_EINT_WAKEUP_MASK 0x0604 45#define EXYNOS_EINT_WAKEUP_MASK 0x0604
46#define S5P_WAKEUP_MASK 0x0608 46#define S5P_WAKEUP_MASK 0x0608
47#define S5P_WAKEUP_MASK2 0x0614 47#define S5P_WAKEUP_MASK2 0x0614
48 48
@@ -180,6 +180,9 @@
180#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8) 180#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG (0x3 << 8)
181#define S5P_CORE_AUTOWAKEUP_EN (1 << 31) 181#define S5P_CORE_AUTOWAKEUP_EN (1 << 31)
182 182
183/* Only for S5Pv210 */
184#define S5PV210_EINT_WAKEUP_MASK 0xC004
185
183/* Only for EXYNOS4210 */ 186/* Only for EXYNOS4210 */
184#define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154 187#define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154
185#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174 188#define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
@@ -641,6 +644,7 @@
641 | EXYNOS5420_KFC_USE_STANDBY_WFI3) 644 | EXYNOS5420_KFC_USE_STANDBY_WFI3)
642 645
643/* For EXYNOS5433 */ 646/* For EXYNOS5433 */
647#define EXYNOS5433_EINT_WAKEUP_MASK (0x060C)
644#define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728) 648#define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
645#define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028) 649#define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028)
646#define EXYNOS5433_PAD_RETENTION_MMC2_OPTION (0x30C8) 650#define EXYNOS5433_PAD_RETENTION_MMC2_OPTION (0x30C8)