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: 2855451 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A254C9F3DC for ; Fri, 6 Sep 2013 20:56:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C23F720371 for ; Fri, 6 Sep 2013 20:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8FB120333 for ; Fri, 6 Sep 2013 20:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754308Ab3IFU4I (ORCPT ); Fri, 6 Sep 2013 16:56:08 -0400 Received: from smtp.codeaurora.org ([198.145.11.231]:47076 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751477Ab3IFU4H (ORCPT ); Fri, 6 Sep 2013 16:56:07 -0400 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=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Cc: Rohit Vaswani , David Brown , Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Russell King , Daniel Walker , Bryan Huntsman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org 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 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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