aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMyungJoo Ham <myungjoo.ham@samsung.com>2011-07-20 08:08:18 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-07-20 10:39:17 -0400
commit0e9e52655dd1e44578284236a85c8bc93ca0d5db (patch)
tree3472946b93c1da05c5f1f25c6878977881f054bf
parent67dcaec8d62ab751dbd1d5f9b3f3c1ce4205edf5 (diff)
ARM: EXYNOS4: Support ADC
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-exynos4/Kconfig1
-rw-r--r--arch/arm/mach-exynos4/cpu.c4
-rw-r--r--arch/arm/mach-exynos4/include/mach/irqs.h3
-rw-r--r--arch/arm/mach-exynos4/include/mach/map.h5
4 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index a4fb109984f6..0cdb1fd5385a 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -192,6 +192,7 @@ config MACH_NURI
192 select EXYNOS4_SETUP_SDHCI 192 select EXYNOS4_SETUP_SDHCI
193 select EXYNOS4_SETUP_USB_PHY 193 select EXYNOS4_SETUP_USB_PHY
194 select SAMSUNG_DEV_PWM 194 select SAMSUNG_DEV_PWM
195 select SAMSUNG_DEV_ADC
195 help 196 help
196 Machine support for Samsung Mobile NURI Board. 197 Machine support for Samsung Mobile NURI Board.
197 198
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c
index 910ade65e035..b0370f79ce7e 100644
--- a/arch/arm/mach-exynos4/cpu.c
+++ b/arch/arm/mach-exynos4/cpu.c
@@ -20,7 +20,9 @@
20 20
21#include <plat/cpu.h> 21#include <plat/cpu.h>
22#include <plat/clock.h> 22#include <plat/clock.h>
23#include <plat/devs.h>
23#include <plat/exynos4.h> 24#include <plat/exynos4.h>
25#include <plat/adc-core.h>
24#include <plat/sdhci.h> 26#include <plat/sdhci.h>
25#include <plat/devs.h> 27#include <plat/devs.h>
26#include <plat/fimc-core.h> 28#include <plat/fimc-core.h>
@@ -140,6 +142,8 @@ void __init exynos4_map_io(void)
140 exynos4_default_sdhci2(); 142 exynos4_default_sdhci2();
141 exynos4_default_sdhci3(); 143 exynos4_default_sdhci3();
142 144
145 s3c_adc_setname("samsung-adc-v3");
146
143 s3c_fimc_setname(0, "exynos4-fimc"); 147 s3c_fimc_setname(0, "exynos4-fimc");
144 s3c_fimc_setname(1, "exynos4-fimc"); 148 s3c_fimc_setname(1, "exynos4-fimc");
145 s3c_fimc_setname(2, "exynos4-fimc"); 149 s3c_fimc_setname(2, "exynos4-fimc");
diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h
index 250427f6dcc1..31f6bedcc52e 100644
--- a/arch/arm/mach-exynos4/include/mach/irqs.h
+++ b/arch/arm/mach-exynos4/include/mach/irqs.h
@@ -139,6 +139,9 @@
139 139
140#define MAX_COMBINER_NR 16 140#define MAX_COMBINER_NR 16
141 141
142#define IRQ_ADC IRQ_ADC0
143#define IRQ_TC IRQ_PEN0
144
142#define S5P_IRQ_EINT_BASE COMBINER_IRQ(MAX_COMBINER_NR, 0) 145#define S5P_IRQ_EINT_BASE COMBINER_IRQ(MAX_COMBINER_NR, 0)
143 146
144#define S5P_EINT_BASE1 (S5P_IRQ_EINT_BASE + 0) 147#define S5P_EINT_BASE1 (S5P_IRQ_EINT_BASE + 0)
diff --git a/arch/arm/mach-exynos4/include/mach/map.h b/arch/arm/mach-exynos4/include/mach/map.h
index 36773561f54e..0e0016fad20f 100644
--- a/arch/arm/mach-exynos4/include/mach/map.h
+++ b/arch/arm/mach-exynos4/include/mach/map.h
@@ -110,6 +110,9 @@
110 110
111#define EXYNOS4_PA_IIC(x) (0x13860000 + ((x) * 0x10000)) 111#define EXYNOS4_PA_IIC(x) (0x13860000 + ((x) * 0x10000))
112 112
113#define EXYNOS4_PA_ADC 0x13910000
114#define EXYNOS4_PA_ADC1 0x13911000
115
113#define EXYNOS4_PA_AC97 0x139A0000 116#define EXYNOS4_PA_AC97 0x139A0000
114 117
115#define EXYNOS4_PA_SPDIF 0x139B0000 118#define EXYNOS4_PA_SPDIF 0x139B0000
@@ -132,6 +135,8 @@
132#define S3C_PA_IIC5 EXYNOS4_PA_IIC(5) 135#define S3C_PA_IIC5 EXYNOS4_PA_IIC(5)
133#define S3C_PA_IIC6 EXYNOS4_PA_IIC(6) 136#define S3C_PA_IIC6 EXYNOS4_PA_IIC(6)
134#define S3C_PA_IIC7 EXYNOS4_PA_IIC(7) 137#define S3C_PA_IIC7 EXYNOS4_PA_IIC(7)
138#define SAMSUNG_PA_ADC EXYNOS4_PA_ADC
139#define SAMSUNG_PA_ADC1 EXYNOS4_PA_ADC1
135#define S3C_PA_RTC EXYNOS4_PA_RTC 140#define S3C_PA_RTC EXYNOS4_PA_RTC
136#define S3C_PA_WDT EXYNOS4_PA_WATCHDOG 141#define S3C_PA_WDT EXYNOS4_PA_WATCHDOG
137 142