diff options
author | Naveen Krishna Ch <ch.naveen@samsung.com> | 2010-06-09 05:55:19 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 05:32:50 -0400 |
commit | 50e9769ad5cfdcfefcfdf99236a3c962e82ebc09 (patch) | |
tree | ecbd28fe4a66813b07f883353a15511c89a7a303 /arch/arm/mach-s5pv210/cpu.c | |
parent | 0ab0b6d226caa4a0268ecbce76a7376c3f40ee6b (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.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 411a4a9cbfc7..68317a4170cf 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <plat/devs.h> | 32 | #include <plat/devs.h> |
33 | #include <plat/clock.h> | 33 | #include <plat/clock.h> |
34 | #include <plat/s5pv210.h> | 34 | #include <plat/s5pv210.h> |
35 | #include <plat/adc-core.h> | ||
35 | #include <plat/iic-core.h> | 36 | #include <plat/iic-core.h> |
36 | #include <plat/sdhci.h> | 37 | #include <plat/sdhci.h> |
37 | 38 | ||
@@ -76,10 +77,6 @@ static void s5pv210_idle(void) | |||
76 | 77 | ||
77 | void __init s5pv210_map_io(void) | 78 | void __init s5pv210_map_io(void) |
78 | { | 79 | { |
79 | #ifdef CONFIG_S3C_DEV_ADC | ||
80 | s3c_device_adc.name = "s3c64xx-adc"; | ||
81 | #endif | ||
82 | |||
83 | iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); | 80 | iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); |
84 | 81 | ||
85 | /* initialise device information early */ | 82 | /* initialise device information early */ |
@@ -87,6 +84,8 @@ void __init s5pv210_map_io(void) | |||
87 | s5pv210_default_sdhci1(); | 84 | s5pv210_default_sdhci1(); |
88 | s5pv210_default_sdhci2(); | 85 | s5pv210_default_sdhci2(); |
89 | 86 | ||
87 | s3c_adc_setname("s3c64xx-adc"); | ||
88 | |||
90 | /* the i2c devices are directly compatible with s3c2440 */ | 89 | /* the i2c devices are directly compatible with s3c2440 */ |
91 | s3c_i2c0_setname("s3c2440-i2c"); | 90 | s3c_i2c0_setname("s3c2440-i2c"); |
92 | s3c_i2c1_setname("s3c2440-i2c"); | 91 | s3c_i2c1_setname("s3c2440-i2c"); |