Commit 3554c229 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-fixes-2' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 1154f858 35f8550c
...@@ -55,12 +55,13 @@ void __init s3c_init_cpu(unsigned long idcode, ...@@ -55,12 +55,13 @@ void __init s3c_init_cpu(unsigned long idcode,
printk("CPU %s (id 0x%08lx)\n", cpu->name, 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); printk(KERN_ERR "CPU %s support not enabled\n", cpu->name);
panic("Unsupported Samsung CPU"); panic("Unsupported Samsung CPU");
} }
cpu->map_io(); if (cpu->map_io)
cpu->map_io();
} }
/* s3c24xx_init_clocks /* s3c24xx_init_clocks
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment