From patchwork Fri Sep 6 20:55:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Cartwright X-Patchwork-Id: 2855471 Return-Path: X-Original-To: patchwork-linux-arm@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 7A157BF43F for ; Fri, 6 Sep 2013 20:56:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A05220371 for ; Fri, 6 Sep 2013 20:56:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6544220333 for ; Fri, 6 Sep 2013 20:56:38 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VI34y-0005tQ-Lw; Fri, 06 Sep 2013 20:56:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VI34w-00084b-IT; Fri, 06 Sep 2013 20:56:30 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VI34t-00083y-VO for linux-arm-kernel@lists.infradead.org; Fri, 06 Sep 2013 20:56:28 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 1169C13EDCE; Fri, 6 Sep 2013 20:56:07 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id F2FD113EFCC; Fri, 6 Sep 2013 20:56:06 +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=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from joshc.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com [67.52.129.61]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: joshc@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id AE2E113EDCE; Fri, 6 Sep 2013 20:56:06 +0000 (UTC) Received: by joshc.qualcomm.com (Postfix, from userid 1000) id E38D960E08; Fri, 6 Sep 2013 15:55:38 -0500 (CDT) Date: Fri, 6 Sep 2013 15:55:38 -0500 From: Josh Cartwright To: Stephen Boyd Subject: Re: [PATCH] ARM: msm: Remove irqs-*.h files for DT based targets Message-ID: <20130906205538.GK808@joshc.qualcomm.com> References: <20130906195300.GJ808@joshc.qualcomm.com> <1378499517-24014-1-git-send-email-sboyd@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1378499517-24014-1-git-send-email-sboyd@codeaurora.org> User-Agent: Mutt/1.5.21 (2012-12-30) X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130906_165628_067611_7BFAE7D1 X-CRM114-Status: GOOD ( 19.99 ) X-Spam-Score: -4.3 (----) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Ian Campbell , Pawel Moll , Stephen Warren , linux-arm-msm@vger.kernel.org, Rohit Vaswani , Rob Herring , linux-kernel@vger.kernel.org, Bryan Huntsman , Daniel Walker , David Brown , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Sep 06, 2013 at 01:31:57PM -0700, Stephen Boyd wrote: > We don't want or need the irqs.h files from the DT based MSM > targets. Remove these header files and select sparse irq so that > we don't try to include the mach/irqs.h file. > > Signed-off-by: Stephen Boyd > --- > > On 09/06, Josh Cartwright wrote: > > > > Selecting _only_ ARCH_MSM8974 with these changes breaks the build with: > > I've been meaning to fix this. Perhaps you can use this patch as a base > and then push the SPARSE_IRQ selection into the DT config? Sounds sane to me. AFAICT, we didn't yet have any users of these defines upstream. Using SPARSE_IRQ puts on the path of multiplatform support anyway. FWIW, I tested this by applying this change under Rohit's and squashing the following with patch 1/2: diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index fe35acf..f4a0aaa 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -50,7 +50,6 @@ config ARCH_MSM8X60 select HAVE_SMP select MSM_SCM if SMP select USE_OF - select SPARSE_IRQ config ARCH_MSM8960 bool "MSM8960" @@ -60,7 +59,6 @@ config ARCH_MSM8960 select GPIO_MSM_V2 select MSM_SCM if SMP select USE_OF - select SPARSE_IRQ config ARCH_MSM8974 bool "MSM8974" @@ -74,6 +72,7 @@ config ARCH_MSM8974 config ARCH_MSM_DT def_bool y depends on (ARCH_MSM8X60 || ARCH_MSM8960 || ARCH_MSM8974) + select SPARSE_IRQ config MSM_HAS_DEBUG_UART_HS bool