* Hiremath, Vaibhav <hvaibhav@xxxxxx> [120528 23:17]: > On Fri, May 11, 2012 at 00:38:49, Hiremath, Vaibhav wrote: > > From: Afzal Mohammed <afzal@xxxxxx> > > > > This patch adds minimal support for AM335X machine init. > > > > During last merge window, two separate patches supporting am33xx > > machine init had been submitted, > > > > 1. Link to earlier Baseport patch submission (Legacy): > > http://www.mail-archive.com/linux-omap@xxxxxxxxxxxxxxx/msg59325.html > > 2. Link to earlier DT based machine init support patch submission: > > http://www.mail-archive.com/linux-omap@xxxxxxxxxxxxxxx/msg61398.html > > > > And both had got accepted at that time, but got missed during > > merge window. > > > > But now, since we have taken decision to make am33xx as a separate > > class and not to follow omap3 family, these patches needs to changes > > accordingly (only changes), > > > > - Combine both the patches, since early init and timer init > > used in board-generic.c file requires them. > > - Remove dependency on AM3517EVM, and only use DT approach > > for machine init. > > - Change the config option (as changed recently) > > CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX > > > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > > Cc: Benoit Cousson <b-cousson@xxxxxx> > > Cc: Paul Walmsley <paul@xxxxxxxxx> > > --- > > arch/arm/mach-omap2/board-generic.c | 18 ++++++++++++++++++ > > arch/arm/mach-omap2/common.h | 2 ++ > > arch/arm/mach-omap2/io.c | 10 ++++++++++ > > arch/arm/mach-omap2/irq.c | 2 +- > > arch/arm/mach-omap2/timer.c | 5 +++++ > > 5 files changed, 36 insertions(+), 1 deletions(-) > > > > Tony, > > Can this be merged now??? Adding this too to devel-am33xx branch. 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
