aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5pv210/cpu.c
diff options
context:
space:
mode:
authorNaveen Krishna Ch <ch.naveen@samsung.com>2010-06-09 15:25:19 +0530
committerKukjin Kim <kgene.kim@samsung.com>2010-08-05 18:32:50 +0900
commit50e9769ad5cfdcfefcfdf99236a3c962e82ebc09 (patch)
treeecbd28fe4a66813b07f883353a15511c89a7a303 /arch/arm/mach-s5pv210/cpu.c
parent0ab0b6d226caa4a0268ecbce76a7376c3f40ee6b (diff)
ARM: SAMSUNG: Implement set_name function for ADC devices
This patch implements s3c_adc_setname() for Samsung SoCs. Also updates its usage in S3C64XX, S5P6440, and S5PV210. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210/cpu.c')
-rw-r--r--arch/arm/mach-s5pv210/cpu.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 411a4a9cbfc..68317a4170c 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -32,6 +32,7 @@
#include <plat/devs.h>
#include <plat/clock.h>
#include <plat/s5pv210.h>
+#include <plat/adc-core.h>
#include <plat/iic-core.h>
#include <plat/sdhci.h>
@@ -76,10 +77,6 @@ static void s5pv210_idle(void)
void __init s5pv210_map_io(void)
{
-#ifdef CONFIG_S3C_DEV_ADC
- s3c_device_adc.name = "s3c64xx-adc";
-#endif
-
iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
/* initialise device information early */
@@ -87,6 +84,8 @@ void __init s5pv210_map_io(void)
s5pv210_default_sdhci1();
s5pv210_default_sdhci2();
+ s3c_adc_setname("s3c64xx-adc");
+
/* the i2c devices are directly compatible with s3c2440 */
s3c_i2c0_setname("s3c2440-i2c");
s3c_i2c1_setname("s3c2440-i2c");