Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757429Ab3G3VPQ (ORCPT ); Tue, 30 Jul 2013 17:15:16 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:39335 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756870Ab3G3VPP (ORCPT ); Tue, 30 Jul 2013 17:15:15 -0400 Date: Tue, 30 Jul 2013 22:15:01 +0100 From: Russell King - ARM Linux To: Stephen Boyd Cc: David Brown , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 3/9] ARM: msm: Move debug-macro.S to include/debug Message-ID: <20130730211501.GT24642@n2100.arm.linux.org.uk> References: <1374699274-18388-1-git-send-email-sboyd@codeaurora.org> <1374699274-18388-4-git-send-email-sboyd@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1374699274-18388-4-git-send-email-sboyd@codeaurora.org> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2933 Lines: 76 On Wed, Jul 24, 2013 at 01:54:28PM -0700, Stephen Boyd wrote: > One more step to allowing MSM to participate in the > multi-platform defconfig. > > Signed-off-by: Stephen Boyd > --- > arch/arm/Kconfig.debug | 9 +++- > .../mach/debug-macro.S => include/debug/msm.S} | 32 ++++++++++- > arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 5 -- > arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 5 -- > arch/arm/mach-msm/include/mach/msm_iomap.h | 12 ----- > arch/arm/mach-msm/include/mach/uncompress.h | 63 ---------------------- > arch/arm/mach-msm/io.c | 40 +++++++------- > 7 files changed, 58 insertions(+), 108 deletions(-) > rename arch/arm/{mach-msm/include/mach/debug-macro.S => include/debug/msm.S} (61%) > delete mode 100644 arch/arm/mach-msm/include/mach/uncompress.h > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index e401a76..4a62a8d 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -777,6 +777,11 @@ config DEBUG_LL_INCLUDE > DEBUG_IMX6SL_UART > default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \ > DEBUG_KEYSTONE_UART1 > + default "debug/msm.S" if DEBUG_MSM_UART1 || \ > + DEBUG_MSM_UART2 || \ > + DEBUG_MSM_UART3 || \ > + DEBUG_MSM8660_UART || \ > + DEBUG_MSM8960_UART > default "debug/mvebu.S" if DEBUG_MVEBU_UART || \ > DEBUG_MVEBU_UART_ALTERNATE > default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART > @@ -804,13 +809,13 @@ config DEBUG_LL_INCLUDE > > config DEBUG_UNCOMPRESS > bool > - default y if ARCH_MULTIPLATFORM && DEBUG_LL && \ > + default y if (ARCH_MULTIPLATFORM || ARCH_MSM) && DEBUG_LL && \ > !DEBUG_OMAP2PLUS_UART && \ > !DEBUG_TEGRA_UART > > config UNCOMPRESS_INCLUDE > string > - default "debug/uncompress.h" if ARCH_MULTIPLATFORM > + default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM > default "mach/uncompress.h" I hope the above two aren't going to grow. > { > .virtual = (unsigned long) MSM_SHARED_RAM_BASE, > .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS), > .length = MSM_SHARED_RAM_SIZE, > .type = MT_DEVICE, > }, A comment here mentioning that the below must be the last entry would probably be a good idea as you overwrite the virtual/pfn members of this last entry. > +#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ > + defined(CONFIG_DEBUG_MSM_UART3) > + { > + /* virtual and pfn filled in by debug_ll_addr() */ > + .length = SZ_4K, > + .type = MT_DEVICE_NONSHARED, > + } > +#endif Other than that, this seems to be fine. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/