From patchwork Wed Jun 26 15:29:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 2786671 Return-Path: X-Original-To: patchwork-linux-arm@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 4C0419F245 for ; Wed, 26 Jun 2013 15:31:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DFCF20179 for ; Wed, 26 Jun 2013 15:31:34 +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 A4BF4200E3 for ; Wed, 26 Jun 2013 15:31:32 +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 1UrrgG-0005en-8j; Wed, 26 Jun 2013 15:30:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Urrff-000473-QH; Wed, 26 Jun 2013 15:30:11 +0000 Received: from ns.mm-sol.com ([212.124.72.66] helo=extserv.mm-sol.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Urrfa-00044p-H0 for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2013 15:30:08 +0000 Received: from [172.20.1.244] (unknown [172.18.0.3]) by extserv.mm-sol.com (Postfix) with ESMTPSA id E8430C66F; Wed, 26 Jun 2013 18:29:42 +0300 (EEST) Message-ID: <1372260541.6211.12.camel@iivanov-dev.int.mm-sol.com> Subject: Re: [RFC/PATCH 11/11] ARM: msm: Move MSM's DT based hardware to multi-platform support From: "Ivan T. Ivanov" To: Stephen Boyd Date: Wed, 26 Jun 2013 18:29:01 +0300 In-Reply-To: <1371600281-6118-12-git-send-email-sboyd@codeaurora.org> References: <1371600281-6118-1-git-send-email-sboyd@codeaurora.org> <1371600281-6118-12-git-send-email-sboyd@codeaurora.org> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130626_113006_835451_02A11FE7 X-CRM114-Status: GOOD ( 16.84 ) X-Spam-Score: -3.2 (---) Cc: Arnd Bergmann , linux-arm-msm@vger.kernel.org, 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-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Stephen, On Tue, 2013-06-18 at 17:04 -0700, Stephen Boyd wrote: > The DT based MSM platforms can join the multi-platform builds, so > introduce a DT based ARCH_MSM option. This option allows DT based > MSM platforms to be built into the multi-platform kernel. Also > introduce a hidden ARCH_MSM config that both the DT and non-DT > platform support code select to avoid churn in places that depend > on CONFIG_ARCH_MSM. > > Cc: Arnd Bergmann > Signed-off-by: Stephen Boyd > --- > > RFC because this has problems with msm_sdcc and usb_otg using > mach specific APIs. See the cover letter for more details. > You probably already know, but this patch causes compile error: arch/arm/mach-msm/board-dt-8660.c:20:24: fatal error: mach/board.h: No such file or directory I have fixed it locally like this: Regards, Ivan > arch/arm/Kconfig | 3 ++- > arch/arm/mach-msm/Kconfig | 55 +++++++++++++++++++++++++++++------------------ > 2 files changed, 36 insertions(+), 22 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 430c922..22d4fff 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -618,8 +618,9 @@ config ARCH_PXA > help > Support for Intel/Marvell's PXA2xx/PXA3xx processor line. > > -config ARCH_MSM > +config ARCH_MSM_NODT > bool "Qualcomm MSM" > + select ARCH_MSM > select ARCH_REQUIRE_GPIOLIB > select CLKDEV_LOOKUP > select CLKSRC_OF if OF > diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig > index 614e41e..09f996a 100644 > --- a/arch/arm/mach-msm/Kconfig > +++ b/arch/arm/mach-msm/Kconfig > @@ -1,12 +1,42 @@ > +config ARCH_MSM > + bool > + > +config ARCH_MSM_DT > + bool "Qualcomm MSM DT support" if ARCH_MULTI_V7 > + select ARCH_MSM > + select ARCH_REQUIRE_GPIOLIB > + select CLKSRC_OF if OF > + select GENERIC_CLOCKEVENTS > + help > + Support for Qualcomm's DT-based MSM systems. > + > if ARCH_MSM > > -comment "Qualcomm MSM SoC Type" > - depends on (ARCH_MSM8X60 || ARCH_MSM8960) > +menu "MSM options" > + depends on ARCH_MSM_DT > + > +config ARCH_MSM8X60 > + bool "Enable support for MSM8X60" > + select ARM_GIC > + select CPU_V7 > + select GPIO_MSM_V2 > + select HAVE_SMP > + select MSM_SCM if SMP > + > +config ARCH_MSM8960 > + bool "Enable support for MSM8960" > + select ARM_GIC > + select CPU_V7 > + select HAVE_SMP > + select GPIO_MSM_V2 > + select MSM_SCM if SMP > + > +endmenu > > choice > prompt "Qualcomm MSM SoC Type" > default ARCH_MSM7X00A > - depends on !(ARCH_MSM8X60 || ARCH_MSM8960) > + depends on ARCH_MSM_NODT > > config ARCH_MSM7X00A > bool "MSM7x00A / MSM7x01A" > @@ -42,24 +72,6 @@ config ARCH_QSD8X50 > > endchoice > > -config ARCH_MSM8X60 > - bool "MSM8X60" > - select ARM_GIC > - select CPU_V7 > - select GPIO_MSM_V2 > - select HAVE_SMP > - select MSM_SCM if SMP > - select USE_OF > - > -config ARCH_MSM8960 > - bool "MSM8960" > - select ARM_GIC > - select CPU_V7 > - select HAVE_SMP > - select GPIO_MSM_V2 > - select MSM_SCM if SMP > - select USE_OF > - > config MSM_HAS_DEBUG_UART_HS > bool > > @@ -75,6 +87,7 @@ config MSM_VIC > bool > > menu "Qualcomm MSM Board Type" > + depends on ARCH_MSM_NODT > > config MACH_HALIBUT > depends on ARCH_MSM --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c @@ -17,14 +17,8 @@ #include #include -#include #include "common.h" -static void __init msm8x60_init_late(void) -{ - smd_debugfs_init(); -} - static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = { {} }; @@ -45,6 +39,5 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") .smp = smp_ops(msm_smp_ops), .map_io = debug_ll_io_init, .init_machine = msm8x60_dt_init, - .init_late = msm8x60_init_late, .dt_compat = msm8x60_fluid_match, MACHINE_END