diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index d4a8605..61e6c24 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c @@ -38,9 +38,9 @@ #include <plat/ata-core.h> #include <plat/fimc-core.h> #include <plat/iic-core.h> +#include <plat/keypad-core.h> #include <plat/sdhci.h> #include <plat/reset.h> -#include <plat/ace-core.h> /* Initial IO mappings */ @@ -91,11 +91,6 @@ static struct map_desc s5pv210_iodesc[] __initdata = { .length = SZ_4K, .type = MT_DEVICE, }, { - .virtual = (unsigned long)S5P_VA_AUDSS, - .pfn = __phys_to_pfn(S5PV210_PA_AUDSS), - .length = SZ_1M, - .type = MT_DEVICE, - }, { .virtual = (unsigned long)S3C_VA_USB_HSPHY, .pfn =__phys_to_pfn(S5PV210_PA_HSPHY), .length = SZ_4K, @@ -131,7 +126,7 @@ void __init s5pv210_map_io(void) s5pv210_default_sdhci2(); s5pv210_default_sdhci3(); - s3c_adc_setname("samsung-adc-v3"); + s3c_adc_setname("s3c64xx-adc"); s3c_cfcon_setname("s5pv210-pata"); @@ -146,9 +141,8 @@ void __init s5pv210_map_io(void) s3c_fb_setname("s5pv210-fb"); -#ifdef CONFIG_S5P_DEV_ACE - s5p_ace_setname("s5pv210-ace"); -#endif + /* Use s5pv210-keypad instead of samsung-keypad */ + samsung_keypad_setname("s5pv210-keypad"); } void __init s5pv210_init_clocks(int xtal) |