diff options
| -rw-r--r-- | arch/arm/mach-exynos/exynos.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/pm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/regs-pmu.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/regs-sys.h | 22 |
4 files changed, 24 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index 2e5dd50d1f86..269526bcc039 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mfc.h" | 30 | #include "mfc.h" |
| 31 | #include "regs-pmu.h" | 31 | #include "regs-pmu.h" |
| 32 | #include "regs-sys.h" | ||
| 32 | 33 | ||
| 33 | static struct map_desc exynos4_iodesc[] __initdata = { | 34 | static struct map_desc exynos4_iodesc[] __initdata = { |
| 34 | { | 35 | { |
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 202ca73e49c4..f127c0cefbb8 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include "common.h" | 36 | #include "common.h" |
| 37 | #include "regs-pmu.h" | 37 | #include "regs-pmu.h" |
| 38 | #include "regs-sys.h" | ||
| 38 | 39 | ||
| 39 | /** | 40 | /** |
| 40 | * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping | 41 | * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping |
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h index 1d13b08708f0..790af14626bc 100644 --- a/arch/arm/mach-exynos/regs-pmu.h +++ b/arch/arm/mach-exynos/regs-pmu.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <mach/map.h> | 15 | #include <mach/map.h> |
| 16 | 16 | ||
| 17 | #define S5P_PMUREG(x) (S5P_VA_PMU + (x)) | 17 | #define S5P_PMUREG(x) (S5P_VA_PMU + (x)) |
| 18 | #define S5P_SYSREG(x) (S3C_VA_SYS + (x)) | ||
| 19 | 18 | ||
| 20 | #define S5P_CENTRAL_SEQ_CONFIGURATION S5P_PMUREG(0x0200) | 19 | #define S5P_CENTRAL_SEQ_CONFIGURATION S5P_PMUREG(0x0200) |
| 21 | 20 | ||
| @@ -188,8 +187,6 @@ | |||
| 188 | 187 | ||
| 189 | /* For EXYNOS5 */ | 188 | /* For EXYNOS5 */ |
| 190 | 189 | ||
| 191 | #define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234) | ||
| 192 | |||
| 193 | #define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408) | 190 | #define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408) |
| 194 | #define EXYNOS5_MASK_WDTRESET_REQUEST S5P_PMUREG(0x040C) | 191 | #define EXYNOS5_MASK_WDTRESET_REQUEST S5P_PMUREG(0x040C) |
| 195 | 192 | ||
diff --git a/arch/arm/mach-exynos/regs-sys.h b/arch/arm/mach-exynos/regs-sys.h new file mode 100644 index 000000000000..84332b0dd7a6 --- /dev/null +++ b/arch/arm/mach-exynos/regs-sys.h | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2014 Samsung Electronics Co., Ltd. | ||
| 3 | * http://www.samsung.com | ||
| 4 | * | ||
| 5 | * EXYNOS - system register definition | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef __ASM_ARCH_REGS_SYS_H | ||
| 13 | #define __ASM_ARCH_REGS_SYS_H __FILE__ | ||
| 14 | |||
| 15 | #include <mach/map.h> | ||
| 16 | |||
| 17 | #define S5P_SYSREG(x) (S3C_VA_SYS + (x)) | ||
| 18 | |||
| 19 | /* For EXYNOS5 */ | ||
| 20 | #define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234) | ||
| 21 | |||
| 22 | #endif /* __ASM_ARCH_REGS_SYS_H */ | ||
