* Rajendra Nayak <rnayak@xxxxxx> [111214 03:24]: > Pass minimal data needed for console boot, from dt, for > OMAP4 panda/sdp and OMAP3 beagle boards, and get rid of the > static initialization from generic board file. > > Acked-by: Rob Herring <rob.herring@xxxxxxxxxxx> > Signed-off-by: Rajendra Nayak <rnayak@xxxxxx> This we can't merge because this breaks serial console for omap2 because you're not adding the omap2 specific dtsi entries for omap2.. > --- a/arch/arm/mach-omap2/board-generic.c > +++ b/arch/arm/mach-omap2/board-generic.c > @@ -69,7 +69,6 @@ static void __init omap_generic_init(void) > if (node) > irq_domain_add_simple(node, 0); > > - omap_serial_init(); > omap_sdrc_init(NULL, NULL); > > of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); ..and you're removing the call for omap_serial_init. Please just update this patch with the omap2 entries as well. Other than that looks good to me. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
