From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] ARM: OMAP2+: am33xx: Add AM335XEVM machine support Date: Tue, 5 Jun 2012 00:53:44 -0700 Message-ID: <20120605075344.GH12766@atomide.com> References: <1336676929-28621-1-git-send-email-hvaibhav@ti.com> <79CD15C6BA57404B839C016229A409A83EA3923D@DBDE01.ent.ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:25051 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757579Ab2FEHxr (ORCPT ); Tue, 5 Jun 2012 03:53:47 -0400 Content-Disposition: inline In-Reply-To: <79CD15C6BA57404B839C016229A409A83EA3923D@DBDE01.ent.ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Hiremath, Vaibhav" Cc: "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "Mohammed, Afzal" , "Cousson, Benoit" , Paul Walmsley * Hiremath, Vaibhav [120528 23:17]: > On Fri, May 11, 2012 at 00:38:49, Hiremath, Vaibhav wrote: > > From: Afzal Mohammed > > > > 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@vger.kernel.org/msg59325.html > > 2. Link to earlier DT based machine init support patch submission: > > http://www.mail-archive.com/linux-omap@vger.kernel.org/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 > > Signed-off-by: Vaibhav Hiremath > > Cc: Tony Lindgren > > Cc: Benoit Cousson > > Cc: Paul Walmsley > > --- > > 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