From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/9] ARM: msm: Move debug-macro.S to include/debug
Date: Tue, 30 Jul 2013 22:15:01 +0100 [thread overview]
Message-ID: <20130730211501.GT24642@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1374699274-18388-4-git-send-email-sboyd@codeaurora.org>
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 <sboyd@codeaurora.org>
> ---
> 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.
next prev parent reply other threads:[~2013-07-30 21:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-24 20:54 [PATCH v2 0/9] Move MSM closer to multi-platform Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 1/9] ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60 Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 2/9] ARM: msm: Don't compile __msm_ioremap_caller() unless used Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 3/9] ARM: msm: Move debug-macro.S to include/debug Stephen Boyd
2013-07-30 20:55 ` David Brown
2013-07-30 21:09 ` Russell King - ARM Linux
2013-07-30 21:15 ` Russell King - ARM Linux [this message]
2013-07-30 21:53 ` Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 4/9] ARM: msm: Remove TMR and TMR0 static mappings Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 5/9] ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 6/9] ARM: msm: Move mach/board.h contents to common.h Stephen Boyd
2013-07-29 20:20 ` David Brown
2013-07-30 5:45 ` Tomi Valkeinen
2013-07-24 20:54 ` [PATCH v2 7/9] ARM: msm: Remove devices-iommu.c Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 8/9] iommu/msm: Move mach includes to iommu directory Stephen Boyd
2013-07-24 20:54 ` [PATCH v2 9/9] ARM: msm: Only compile io.c on platforms that use it Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130730211501.GT24642@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).