Commit e5cda42c authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: exynos: Define EINT_WAKEUP_MASK registers for S5Pv210 and Exynos5433 



S5Pv210 and Exynos5433/Exynos7 have different address of
EINT_WAKEUP_MASK register.  Rename existing S5P_EINT_WAKEUP_MASK to
avoid confusion and add new ones.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <snawrocki@kernel.org>
Acked-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parent bb928dfd

arch/arm/mach-exynos/suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int exynos5420_cpu_suspend(unsigned long arg) 
static void exynos_pm_set_wakeup_mask(void)

{

	/* Set wake-up mask registers */

	pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);

	pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);

	pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);

}

include/linux/soc/samsung/exynos-regs-pmu.h

+5 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define EXYNOS_SWRESET				0x0400



#define S5P_WAKEUP_STAT				0x0600

#define S5P_EINT_WAKEUP_MASK			0x0604

#define EXYNOS_EINT_WAKEUP_MASK			0x0604

#define S5P_WAKEUP_MASK				0x0608

#define S5P_WAKEUP_MASK2				0x0614
@@ -180,6 +180,9 @@ 
#define S5P_CORE_WAKEUP_FROM_LOCAL_CFG		(0x3 << 8)

#define S5P_CORE_AUTOWAKEUP_EN			(1 << 31)



/* Only for S5Pv210 */

#define S5PV210_EINT_WAKEUP_MASK	0xC004



/* Only for EXYNOS4210 */

#define S5P_CMU_CLKSTOP_LCD1_LOWPWR	0x1154

#define S5P_CMU_RESET_LCD1_LOWPWR	0x1174
@@ -641,6 +644,7 @@ 
					 | EXYNOS5420_KFC_USE_STANDBY_WFI3)



/* For EXYNOS5433 */

#define EXYNOS5433_EINT_WAKEUP_MASK				(0x060C)

#define EXYNOS5433_USBHOST30_PHY_CONTROL			(0x0728)

#define EXYNOS5433_PAD_RETENTION_AUD_OPTION			(0x3028)

#define EXYNOS5433_PAD_RETENTION_MMC2_OPTION			(0x30C8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE