diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 14:06:56 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-18 15:21:14 -0500 |
commit | 65c9a8530bec45cea1137635b7992bbb417de9de (patch) | |
tree | 6eed16d965bacd726ef14b8f7c018e90b3c52d06 /arch/arm | |
parent | e44de221d3ddb99387b04cfd49483bcd05daa6fb (diff) |
ARM: EXYNOS: local regs-pmu.h header file
This moves regs-pmu.h file into mach-exynos directory.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos/common.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/hotplug.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/pm_domains.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/pmu.c | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 61d2906ccefb..1fc042481c5b 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -38,13 +38,14 @@ | |||
38 | #include <asm/cacheflush.h> | 38 | #include <asm/cacheflush.h> |
39 | 39 | ||
40 | #include <mach/regs-irq.h> | 40 | #include <mach/regs-irq.h> |
41 | #include <mach/regs-pmu.h> | ||
42 | 41 | ||
43 | #include <plat/cpu.h> | 42 | #include <plat/cpu.h> |
44 | #include <plat/pm.h> | 43 | #include <plat/pm.h> |
45 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
46 | 45 | ||
47 | #include "common.h" | 46 | #include "common.h" |
47 | #include "regs-pmu.h" | ||
48 | |||
48 | #define L2_AUX_VAL 0x7C470001 | 49 | #define L2_AUX_VAL 0x7C470001 |
49 | #define L2_AUX_MASK 0xC200ffff | 50 | #define L2_AUX_MASK 0xC200ffff |
50 | 51 | ||
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index ddbfe8709fe7..6ba13ea61ad2 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c | |||
@@ -23,12 +23,12 @@ | |||
23 | #include <asm/unified.h> | 23 | #include <asm/unified.h> |
24 | #include <asm/cpuidle.h> | 24 | #include <asm/cpuidle.h> |
25 | #include <mach/regs-clock.h> | 25 | #include <mach/regs-clock.h> |
26 | #include <mach/regs-pmu.h> | ||
27 | 26 | ||
28 | #include <plat/cpu.h> | 27 | #include <plat/cpu.h> |
29 | #include <plat/pm.h> | 28 | #include <plat/pm.h> |
30 | 29 | ||
31 | #include "common.h" | 30 | #include "common.h" |
31 | #include "regs-pmu.h" | ||
32 | 32 | ||
33 | #define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ | 33 | #define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ |
34 | S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ | 34 | S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \ |
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c index af90cfa2f826..5eead530c6f8 100644 --- a/arch/arm/mach-exynos/hotplug.c +++ b/arch/arm/mach-exynos/hotplug.c | |||
@@ -19,10 +19,10 @@ | |||
19 | #include <asm/cp15.h> | 19 | #include <asm/cp15.h> |
20 | #include <asm/smp_plat.h> | 20 | #include <asm/smp_plat.h> |
21 | 21 | ||
22 | #include <mach/regs-pmu.h> | ||
23 | #include <plat/cpu.h> | 22 | #include <plat/cpu.h> |
24 | 23 | ||
25 | #include "common.h" | 24 | #include "common.h" |
25 | #include "regs-pmu.h" | ||
26 | 26 | ||
27 | static inline void cpu_enter_lowpower_a9(void) | 27 | static inline void cpu_enter_lowpower_a9(void) |
28 | { | 28 | { |
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 1fe075a70c1e..65a46465ac5e 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
@@ -14,10 +14,10 @@ | |||
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | 15 | ||
16 | #include <asm/mach/arch.h> | 16 | #include <asm/mach/arch.h> |
17 | #include <mach/regs-pmu.h> | ||
18 | #include <plat/mfc.h> | 17 | #include <plat/mfc.h> |
19 | 18 | ||
20 | #include "common.h" | 19 | #include "common.h" |
20 | #include "regs-pmu.h" | ||
21 | 21 | ||
22 | static void __init exynos5_dt_machine_init(void) | 22 | static void __init exynos5_dt_machine_init(void) |
23 | { | 23 | { |
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 58b43e6f9262..b5b34f863327 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c | |||
@@ -28,11 +28,11 @@ | |||
28 | 28 | ||
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <mach/regs-clock.h> | 30 | #include <mach/regs-clock.h> |
31 | #include <mach/regs-pmu.h> | ||
32 | 31 | ||
33 | #include <plat/cpu.h> | 32 | #include <plat/cpu.h> |
34 | 33 | ||
35 | #include "common.h" | 34 | #include "common.h" |
35 | #include "regs-pmu.h" | ||
36 | 36 | ||
37 | extern void exynos4_secondary_startup(void); | 37 | extern void exynos4_secondary_startup(void); |
38 | 38 | ||
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 7fb0f13d600d..a577eb929bee 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c | |||
@@ -31,10 +31,10 @@ | |||
31 | 31 | ||
32 | #include <mach/regs-irq.h> | 32 | #include <mach/regs-irq.h> |
33 | #include <mach/regs-clock.h> | 33 | #include <mach/regs-clock.h> |
34 | #include <mach/regs-pmu.h> | ||
35 | #include <mach/pm-core.h> | 34 | #include <mach/pm-core.h> |
36 | 35 | ||
37 | #include "common.h" | 36 | #include "common.h" |
37 | #include "regs-pmu.h" | ||
38 | 38 | ||
39 | static const struct sleep_save exynos4_set_clksrc[] = { | 39 | static const struct sleep_save exynos4_set_clksrc[] = { |
40 | { .reg = EXYNOS4_CLKSRC_MASK_TOP , .val = 0x00000001, }, | 40 | { .reg = EXYNOS4_CLKSRC_MASK_TOP , .val = 0x00000001, }, |
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 1703593e366c..ff508360d27c 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c | |||
@@ -22,9 +22,10 @@ | |||
22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | 24 | ||
25 | #include <mach/regs-pmu.h> | ||
26 | #include <plat/devs.h> | 25 | #include <plat/devs.h> |
27 | 26 | ||
27 | #include "regs-pmu.h" | ||
28 | |||
28 | /* | 29 | /* |
29 | * Exynos specific wrapper around the generic power domain | 30 | * Exynos specific wrapper around the generic power domain |
30 | */ | 31 | */ |
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index e9f7370111f8..176077c58f86 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c | |||
@@ -14,9 +14,9 @@ | |||
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> | ||
18 | 17 | ||
19 | #include "common.h" | 18 | #include "common.h" |
19 | #include "regs-pmu.h" | ||
20 | 20 | ||
21 | static const struct exynos_pmu_conf *exynos_pmu_config; | 21 | static const struct exynos_pmu_conf *exynos_pmu_config; |
22 | 22 | ||