diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:55:32 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 18:55:32 +0900 |
| commit | ea5a4e209ddca984bbb5803b30d5e013e631f9ac (patch) | |
| tree | a7f2cdb121fc44cfd7c382207104f867f93736c9 /arch/arm/mach-s5pv210/cpu.c | |
| parent | fac3d3555568de1755025a9609daf492dd548a59 (diff) | |
| parent | eff4c74da7944ba30feb47b51d1e9e940e6682ff (diff) | |
ARM: Merge for-2635-4/s5pv210-boards
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1
Conflicts:
arch/arm/mach-s5pv210/include/mach/map.h
Diffstat (limited to 'arch/arm/mach-s5pv210/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index 359bdc8f3b6..76084d85fd2 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c @@ -32,6 +32,8 @@ #include <plat/devs.h> #include <plat/clock.h> #include <plat/s5pv210.h> +#include <plat/iic-core.h> +#include <plat/sdhci.h> /* Initial IO mappings */ @@ -77,6 +79,16 @@ void __init s5pv210_map_io(void) s3c_device_adc.name = "s3c64xx-adc"; iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); + + /* initialise device information early */ + s5pv210_default_sdhci0(); + s5pv210_default_sdhci1(); + s5pv210_default_sdhci2(); + + /* the i2c devices are directly compatible with s3c2440 */ + s3c_i2c0_setname("s3c2440-i2c"); + s3c_i2c1_setname("s3c2440-i2c"); + s3c_i2c2_setname("s3c2440-i2c"); } void __init s5pv210_init_clocks(int xtal) |