From patchwork Thu Jun 30 11:25:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 932642 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5UBPM98027318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 30 Jun 2011 11:25:43 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QcFMv-0007YS-UU; Thu, 30 Jun 2011 11:25:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QcFMv-0000AJ-Ii; Thu, 30 Jun 2011 11:25:13 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QcFMs-00009z-B1 for linux-arm-kernel@lists.infradead.org; Thu, 30 Jun 2011 11:25:11 +0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0M6RLT-1RW74c16ux-00yORP; Thu, 30 Jun 2011 13:25:05 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [GIT PULL] omap clean-up for v3.1 merge window Date: Thu, 30 Jun 2011 13:25:02 +0200 User-Agent: KMail/1.12.2 (Linux/2.6.31-22-generic; KDE/4.3.2; x86_64; ; ) References: <20110630091019.GJ23145@atomide.com> In-Reply-To: <20110630091019.GJ23145@atomide.com> MIME-Version: 1.0 Message-Id: <201106301325.02204.arnd@arndb.de> X-Provags-ID: V02:K0:kkyiGDWMGoy/ryxxgPqWX8kq9gTKJ4tkJCWLOs/fxIK U3VlmkkTvG7Y4v3dCHstWf5UvF3ERAvQnHsVC40fzuckeybyNA b0c++9cAztirkVKVyaTGapQ8nm13ffeQr0g3cSEeFnjbe1Culf ua/UEbe1fS28xIvxOCheLf+JZ/6ofStP+UJHoZMjGoku1WT6EU YPgGNo5Nlsd4Ivn+py4nA== X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110630_072510_698691_34238C9D X-CRM114-Status: GOOD ( 16.80 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] Cc: Tony Lindgren , Thomas Gleixner , linux-omap@vger.kernel.org, Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Jun 2011 11:25:43 +0000 (UTC) On Thursday 30 June 2011, Tony Lindgren wrote: > Hi Arnd & Nico, > > Please pull omap clean-up patches from: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-cleanup > > This branch contains little bit more of omap code shrinkage > for regulators and PM debug. > > It also contains cleanup of irq and timer init code, and some > fixes. Hi Tony, The cleanups all look great, with one exception (see below). In the future, I'd prefer to get separate pull requests for cleanups and bug fixes, but no need to worry about it this time. > I have not added this into linux next assuming that you will > do it. If not, please let me know and I will add it. Right, I'll ask Stephen to add the master branch of the arm-soc tree to linux-next soon, after I've made sure that there are no conflicts with existing branches that get merged there. For our upstream submission, my preference would be to send them piecemeal to Linus and group them across the branches as appropriate. > omap: Set separate timer init functions to avoid cpu_is_omap tests This commit causes a build regression for me in some configurations. If you agree, I'd apply this patch on top: 8<------- omap2+: fix build regression board-generic.c now contains a reference to omap3_timer, but depends only on ARCH_OMAP2, not on ARCH_OMAP3, which controls that symbol. omap2_timer seems to be more appropriate anyway, so use that instead. Signed-off-by: Arnd Bergmann --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -72,5 +72,5 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx") .init_early = omap_generic_init_early, .init_irq = omap2_init_irq, .init_machine = omap_generic_init, - .timer = &omap3_timer, + .timer = &omap2_timer, MACHINE_END