diff options
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-exynos/common.h | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index ec3403c46cbe..d24974666866 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
@@ -111,6 +111,11 @@ config SOC_EXYNOS5260 | |||
111 | default y | 111 | default y |
112 | depends on ARCH_EXYNOS5 | 112 | depends on ARCH_EXYNOS5 |
113 | 113 | ||
114 | config SOC_EXYNOS5410 | ||
115 | bool "SAMSUNG EXYNOS5410" | ||
116 | default y | ||
117 | depends on ARCH_EXYNOS5 | ||
118 | |||
114 | config SOC_EXYNOS5420 | 119 | config SOC_EXYNOS5420 |
115 | bool "SAMSUNG EXYNOS5420" | 120 | bool "SAMSUNG EXYNOS5420" |
116 | default y | 121 | default y |
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 26218e76bb2f..099b22f9fd9f 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #define EXYNOS4_CPU_MASK 0xFFFE0000 | 24 | #define EXYNOS4_CPU_MASK 0xFFFE0000 |
25 | 25 | ||
26 | #define EXYNOS5250_SOC_ID 0x43520000 | 26 | #define EXYNOS5250_SOC_ID 0x43520000 |
27 | #define EXYNOS5410_SOC_ID 0xE5410000 | ||
27 | #define EXYNOS5420_SOC_ID 0xE5420000 | 28 | #define EXYNOS5420_SOC_ID 0xE5420000 |
28 | #define EXYNOS5440_SOC_ID 0xE5440000 | 29 | #define EXYNOS5440_SOC_ID 0xE5440000 |
29 | #define EXYNOS5800_SOC_ID 0xE5422000 | 30 | #define EXYNOS5800_SOC_ID 0xE5422000 |
@@ -42,6 +43,7 @@ IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK) | |||
42 | IS_SAMSUNG_CPU(exynos4212, EXYNOS4212_CPU_ID, EXYNOS4_CPU_MASK) | 43 | IS_SAMSUNG_CPU(exynos4212, EXYNOS4212_CPU_ID, EXYNOS4_CPU_MASK) |
43 | IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK) | 44 | IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK) |
44 | IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK) | 45 | IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK) |
46 | IS_SAMSUNG_CPU(exynos5410, EXYNOS5410_SOC_ID, EXYNOS5_SOC_MASK) | ||
45 | IS_SAMSUNG_CPU(exynos5420, EXYNOS5420_SOC_ID, EXYNOS5_SOC_MASK) | 47 | IS_SAMSUNG_CPU(exynos5420, EXYNOS5420_SOC_ID, EXYNOS5_SOC_MASK) |
46 | IS_SAMSUNG_CPU(exynos5440, EXYNOS5440_SOC_ID, EXYNOS5_SOC_MASK) | 48 | IS_SAMSUNG_CPU(exynos5440, EXYNOS5440_SOC_ID, EXYNOS5_SOC_MASK) |
47 | IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) | 49 | IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) |
@@ -80,6 +82,12 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) | |||
80 | # define soc_is_exynos5250() 0 | 82 | # define soc_is_exynos5250() 0 |
81 | #endif | 83 | #endif |
82 | 84 | ||
85 | #if defined(CONFIG_SOC_EXYNOS5410) | ||
86 | # define soc_is_exynos5410() is_samsung_exynos5410() | ||
87 | #else | ||
88 | # define soc_is_exynos5410() 0 | ||
89 | #endif | ||
90 | |||
83 | #if defined(CONFIG_SOC_EXYNOS5420) | 91 | #if defined(CONFIG_SOC_EXYNOS5420) |
84 | # define soc_is_exynos5420() is_samsung_exynos5420() | 92 | # define soc_is_exynos5420() is_samsung_exynos5420() |
85 | #else | 93 | #else |
@@ -100,8 +108,8 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK) | |||
100 | 108 | ||
101 | #define soc_is_exynos4() (soc_is_exynos4210() || soc_is_exynos4212() || \ | 109 | #define soc_is_exynos4() (soc_is_exynos4210() || soc_is_exynos4212() || \ |
102 | soc_is_exynos4412()) | 110 | soc_is_exynos4412()) |
103 | #define soc_is_exynos5() (soc_is_exynos5250() || soc_is_exynos5420() || \ | 111 | #define soc_is_exynos5() (soc_is_exynos5250() || soc_is_exynos5410() || \ |
104 | soc_is_exynos5800()) | 112 | soc_is_exynos5420() || soc_is_exynos5800()) |
105 | 113 | ||
106 | void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); | 114 | void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); |
107 | 115 | ||