| Message ID | 1250846095-6381-2-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
Santosh Shilimkar <santosh.shilimkar@ti.com> writes: > 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> > > --- > arch/arm/mach-omap2/serial.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c > index e1be77b..e8d55f4 100644 > --- a/arch/arm/mach-omap2/serial.c > +++ b/arch/arm/mach-omap2/serial.c > @@ -620,8 +620,10 @@ void __init omap_serial_init(void) > uart->fck = NULL; > } > > - if (!uart->ick || !uart->fck) > - continue; I'd like to see another FIXME here to the effect that this can be removed when OMAP4 clock framework is in place. > + if (!cpu_is_omap44xx()) { > + if (!uart->ick || !uart->fck) > + continue; > + } > > uart->num = i; > p->private_data = uart; > -- > 1.5.4.7 Other than that, Acked-by: Kevin Hilman <khilman@deeprootsystems.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index e1be77b..e8d55f4 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -620,8 +620,10 @@ void __init omap_serial_init(void) uart->fck = NULL; } - if (!uart->ick || !uart->fck) - continue; + if (!cpu_is_omap44xx()) { + if (!uart->ick || !uart->fck) + continue; + } uart->num = i; p->private_data = uart;