diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 12:49:18 (GMT) |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 12:49:18 (GMT) |
| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /arch/arm/mach-s5pv210/cpu.c | |
| parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
| parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
| download | linux-fsl-qoriq-d61bd77ff1e7c7a0a381c6e656dbc07b37510f37.tar.xz | |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'arch/arm/mach-s5pv210/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index ede1637..c7e0b8a 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c @@ -32,7 +32,9 @@ #include <plat/devs.h> #include <plat/clock.h> #include <plat/s5pv210.h> +#include <plat/adc-core.h> #include <plat/ata-core.h> +#include <plat/fimc-core.h> #include <plat/iic-core.h> #include <plat/keypad-core.h> #include <plat/sdhci.h> @@ -84,9 +86,6 @@ static void s5pv210_sw_reset(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 */ @@ -95,8 +94,14 @@ void __init s5pv210_map_io(void) s5pv210_default_sdhci2(); s5pv210_default_sdhci3(); + s3c_adc_setname("s3c64xx-adc"); + s3c_cfcon_setname("s5pv210-pata"); + s3c_fimc_setname(0, "s5pv210-fimc"); + s3c_fimc_setname(1, "s5pv210-fimc"); + s3c_fimc_setname(2, "s5pv210-fimc"); + /* the i2c devices are directly compatible with s3c2440 */ s3c_i2c0_setname("s3c2440-i2c"); s3c_i2c1_setname("s3c2440-i2c"); |