diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-12 00:44:38 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-12 00:44:38 +0200 |
| commit | 3554c229c2b306a7e75013e2f8b861b6dd915516 (patch) | |
| tree | 5966bf282bc044f04e96aa8154b655444a9469ad /arch | |
| parent | MAINTAINERS: add TI Keystone ARM platform (diff) | |
| parent | ARM: SAMSUNG: fix to support for missing cpu specific map_io (diff) | |
| download | linux-3554c229c2b306a7e75013e2f8b861b6dd915516.tar.xz linux-3554c229c2b306a7e75013e2f8b861b6dd915516.zip | |
Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
Fix to boot kernel on exynos5440 which has no specific map_io(). Current kernel
cannot support no CPU specific map_io() for Samsung SoCs.
* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: fix to support for missing cpu specific map_io
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-samsung/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c index 3e5c4619caa5..50a3ea0037db 100644 --- a/arch/arm/plat-samsung/init.c +++ b/arch/arm/plat-samsung/init.c @@ -55,12 +55,13 @@ void __init s3c_init_cpu(unsigned long idcode, printk("CPU %s (id 0x%08lx)\n", cpu->name, idcode); - if (cpu->map_io == NULL || cpu->init == NULL) { + if (cpu->init == NULL) { printk(KERN_ERR "CPU %s support not enabled\n", cpu->name); panic("Unsupported Samsung CPU"); } - cpu->map_io(); + if (cpu->map_io) + cpu->map_io(); } /* s3c24xx_init_clocks |