summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/serial.c
diff options
context:
space:
mode:
authorSantosh Shilimkar2009-08-22 10:00:12 +0200
committerKevin Hilman2009-09-03 00:07:54 +0200
commitaae290fb4d64e2b09b659f4b8a7f9d2547ef63b1 (patch)
tree2d63eecab36003e4c2ee249e2e9e7e6172ad99f3 /arch/arm/mach-omap2/serial.c
parentARM: OMAP4: Fix NULL pointer dereference crash. (diff)
downloadkernel-qcow2-linux-aae290fb4d64e2b09b659f4b8a7f9d2547ef63b1.tar.gz
kernel-qcow2-linux-aae290fb4d64e2b09b659f4b8a7f9d2547ef63b1.tar.xz
kernel-qcow2-linux-aae290fb4d64e2b09b659f4b8a7f9d2547ef63b1.zip
ARM: OMAP4: Bypass the clock check.
Second reason of OMAP4 boot failure on 2.6.31.rc6, the UART platform data is not getting registered to kernel. Registration was failing because of clock check failure in omap_serial_init(). Below patch fix the same. OMAP4 clock framework patches are still getting discussed on mailing list so till then we need this. Signed-off-by: Syed Rafiuddin <rafiuddin.syed@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
-rw-r--r--arch/arm/mach-omap2/serial.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 645546cbd265..0f508109adcc 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -609,8 +609,11 @@ void __init omap_serial_init(void)
uart->fck = NULL;
}
- if (!uart->ick || !uart->fck)
- continue;
+ /* FIXME: Remove this once the clkdev is ready */
+ if (!cpu_is_omap44xx()) {
+ if (!uart->ick || !uart->fck)
+ continue;
+ }
uart->num = i;
p->private_data = uart;