From patchwork Thu Aug 1 18:59:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 2837211 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A61AFC0319 for ; Thu, 1 Aug 2013 19:00:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E89C202E9 for ; Thu, 1 Aug 2013 19:00:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4ACF0202E5 for ; Thu, 1 Aug 2013 19:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755765Ab3HATAA (ORCPT ); Thu, 1 Aug 2013 15:00:00 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:40223 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752563Ab3HAS77 (ORCPT ); Thu, 1 Aug 2013 14:59:59 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 8517213EC5D; Thu, 1 Aug 2013 18:59:59 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 7410313EF02; Thu, 1 Aug 2013 18:59:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost (i-global252.qualcomm.com [199.106.103.252]) (using SSLv3 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8F60413EC5D; Thu, 1 Aug 2013 18:59:57 +0000 (UTC) Date: Thu, 1 Aug 2013 11:59:56 -0700 From: Stephen Boyd To: Olof Johansson Cc: linux-omap@vger.kernel.org, Russell King - ARM Linux , linux-arm-kernel@lists.infradead.org, Santosh Shilimkar , arm@kernel.org Subject: Re: [FAILURE] omap4430-sdp allnoconfig Message-ID: <20130801185956.GK8868@codeaurora.org> References: <20130801175214.GA23053@n2100.arm.linux.org.uk> <51FAA4C6.10203@ti.com> <20130801182707.GB23053@n2100.arm.linux.org.uk> <51FAA985.3000809@ti.com> <51FAAA31.6020903@codeaurora.org> <51FAAAFD.6000706@codeaurora.org> <51FAAD73.3030103@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <51FAAD73.3030103@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 08/01, Santosh Shilimkar wrote: > This one looks fine for me. Can you send above in > a proper patch ? Let me know if you want me to > send it. > Here's a proper patch. Olof, can you please apply this on top of the merge (and maybe you can fix the merge again to handle the HAVE_CAN problem I mentioned earlier). ---8<--- Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer API, 2013-03-04) broke the omap build when SMP=n because the TWD functions are only compiled on SMP=y builds. Stub out the TWD calls when the TWD isn't built in to to keep everything building. arch/arm/mach-omap2/built-in.o: In function `omap4_local_timer_init': dss-common.c:(.init.text+0x1d90): undefined reference to `twd_local_timer_register' Reported-by: Russell King - ARM Linux Cc: Santosh Shilimkar Signed-off-by: Stephen Boyd Acked-by: Santosh Shilimkar Reported-by: Russell King --- arch/arm/mach-omap2/timer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3b7caba..00dc53e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -600,6 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", #endif #ifdef CONFIG_ARCH_OMAP4 +#ifdef CONFIG_HAVE_ARM_TWD static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { @@ -618,6 +619,12 @@ void __init omap4_local_timer_init(void) pr_err("twd_local_timer_register failed %d\n", err); } } +#else +void __init omap4_local_timer_init(void) +{ + omap4_sync32k_timer_init(); +} +#endif /* CONFIG_HAVE_ARM_TWD */ #endif /* CONFIG_ARCH_OMAP4 */ #ifdef CONFIG_SOC_OMAP5