diff options
| author |   Kukjin Kim <kgene.kim@samsung.com> | 2013-12-19 04:01:24 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-19 05:21:07 +0900 |
| commit | e44de221d3ddb99387b04cfd49483bcd05daa6fb (patch) | |
| tree | bdb9919571284e285cf8f283330ee8763a12bc2f /arch/arm | |
| parent | ARM: EXYNOS: cleanup <mach/regs-pmu.h> (diff) | |
| download | linux-dev-e44de221d3ddb99387b04cfd49483bcd05daa6fb.tar.xz linux-dev-e44de221d3ddb99387b04cfd49483bcd05daa6fb.zip | |
ARM: EXYNOS: remove inclusion <mach/regs-pmu.h> into another headers
This is needed to remove dependency of headers.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/pm-core.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/regs-clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/pmu.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/regs-pmu.h (renamed from arch/arm/mach-exynos/include/mach/regs-pmu.h) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/include/mach/pm-core.h b/arch/arm/mach-exynos/include/mach/pm-core.h index 2b00833b6641..dc0697c2fa92 100644 --- a/arch/arm/mach-exynos/include/mach/pm-core.h +++ b/arch/arm/mach-exynos/include/mach/pm-core.h @@ -19,7 +19,10 @@ #define __ASM_ARCH_PM_CORE_H __FILE__ #include <linux/of.h> -#include <mach/regs-pmu.h> +#include <mach/map.h> + +#define S5P_EINT_WAKEUP_MASK (S5P_VA_PMU + 0x0604) +#define S5P_WAKEUP_MASK (S5P_VA_PMU + 0x0608) #ifdef CONFIG_PINCTRL_EXYNOS extern u32 exynos_get_eint_wake_mask(void); diff --git a/arch/arm/mach-exynos/include/mach/regs-clock.h b/arch/arm/mach-exynos/include/mach/regs-clock.h index d36ad76ad6a4..93dcf7fb293d 100644 --- a/arch/arm/mach-exynos/include/mach/regs-clock.h +++ b/arch/arm/mach-exynos/include/mach/regs-clock.h @@ -365,8 +365,6 @@ /* Compatibility defines and inclusion */ -#include <mach/regs-pmu.h> - #define S5P_EPLL_CON EXYNOS4_EPLL_CON0 #endif /* __ASM_ARCH_REGS_CLOCK_H */ diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index 6609145312ac..e9f7370111f8 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -14,6 +14,7 @@ #include <linux/bug.h> #include <mach/regs-clock.h> +#include <mach/regs-pmu.h> #include "common.h" diff --git a/arch/arm/mach-exynos/include/mach/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index 2c15a8fbcb5a..7c029ce27711 100644 --- a/arch/arm/mach-exynos/include/mach/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h @@ -31,8 +31,6 @@ #define EXYNOS5440_SWRESET S5P_PMUREG(0x00C4) #define S5P_WAKEUP_STAT S5P_PMUREG(0x0600) -#define S5P_EINT_WAKEUP_MASK S5P_PMUREG(0x0604) -#define S5P_WAKEUP_MASK S5P_PMUREG(0x0608) #define S5P_INFORM0 S5P_PMUREG(0x0800) #define S5P_INFORM1 S5P_PMUREG(0x0804) |