diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 14:01:24 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 15:21:07 -0500 |
commit | e44de221d3ddb99387b04cfd49483bcd05daa6fb (patch) | |
tree | bdb9919571284e285cf8f283330ee8763a12bc2f /arch/arm | |
parent | 97ad20758159b129e5462842688642518e4e82bb (diff) |
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 @@ | |||
19 | #define __ASM_ARCH_PM_CORE_H __FILE__ | 19 | #define __ASM_ARCH_PM_CORE_H __FILE__ |
20 | 20 | ||
21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
22 | #include <mach/regs-pmu.h> | 22 | #include <mach/map.h> |
23 | |||
24 | #define S5P_EINT_WAKEUP_MASK (S5P_VA_PMU + 0x0604) | ||
25 | #define S5P_WAKEUP_MASK (S5P_VA_PMU + 0x0608) | ||
23 | 26 | ||
24 | #ifdef CONFIG_PINCTRL_EXYNOS | 27 | #ifdef CONFIG_PINCTRL_EXYNOS |
25 | extern u32 exynos_get_eint_wake_mask(void); | 28 | 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 @@ | |||
365 | 365 | ||
366 | /* Compatibility defines and inclusion */ | 366 | /* Compatibility defines and inclusion */ |
367 | 367 | ||
368 | #include <mach/regs-pmu.h> | ||
369 | |||
370 | #define S5P_EPLL_CON EXYNOS4_EPLL_CON0 | 368 | #define S5P_EPLL_CON EXYNOS4_EPLL_CON0 |
371 | 369 | ||
372 | #endif /* __ASM_ARCH_REGS_CLOCK_H */ | 370 | #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 @@ | |||
14 | #include <linux/bug.h> | 14 | #include <linux/bug.h> |
15 | 15 | ||
16 | #include <mach/regs-clock.h> | 16 | #include <mach/regs-clock.h> |
17 | #include <mach/regs-pmu.h> | ||
17 | 18 | ||
18 | #include "common.h" | 19 | #include "common.h" |
19 | 20 | ||
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 @@ | |||
31 | #define EXYNOS5440_SWRESET S5P_PMUREG(0x00C4) | 31 | #define EXYNOS5440_SWRESET S5P_PMUREG(0x00C4) |
32 | 32 | ||
33 | #define S5P_WAKEUP_STAT S5P_PMUREG(0x0600) | 33 | #define S5P_WAKEUP_STAT S5P_PMUREG(0x0600) |
34 | #define S5P_EINT_WAKEUP_MASK S5P_PMUREG(0x0604) | ||
35 | #define S5P_WAKEUP_MASK S5P_PMUREG(0x0608) | ||
36 | 34 | ||
37 | #define S5P_INFORM0 S5P_PMUREG(0x0800) | 35 | #define S5P_INFORM0 S5P_PMUREG(0x0800) |
38 | #define S5P_INFORM1 S5P_PMUREG(0x0804) | 36 | #define S5P_INFORM1 S5P_PMUREG(0x0804) |