From: maxime.ripard@free-electrons•com (Maxime Ripard)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/4] ARM: sunxi: Add earlyprintk support for UART0 (sun4i)
Date: Mon, 19 Nov 2012 16:22:23 +0100 [thread overview]
Message-ID: <50AA4EAF.4090500@free-electrons.com> (raw)
In-Reply-To: <1353323383-11827-2-git-send-email-sr@denx.de>
Le 19/11/2012 12:09, Stefan Roese a ?crit :
> Signed-off-by: Stefan Roese <sr@denx•de>
> Cc: Maxime Ripard <maxime.ripard@free-electrons•com>
> Cc: Arnd Bergmann <arnd@arndb•de>
> ---
> arch/arm/Kconfig.debug | 9 ++++++++-
> arch/arm/include/debug/sunxi.S | 5 ++++-
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index f12bc3a..cc1ed35 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -345,6 +345,13 @@ choice
> Say Y here if you want kernel low-level debugging support
> on SOCFPGA based platforms.
>
> + config DEBUG_SUNXI_UART0
> + bool "Kernel low-level debugging messages via sunXi UART0"
> + depends on ARCH_SUNXI
> + help
> + Say Y here if you want kernel low-level debugging support
> + on Allwinner A1X based platforms on the UART0.
> +
> config DEBUG_SUNXI_UART1
> bool "Kernel low-level debugging messages via sunXi UART1"
> depends on ARCH_SUNXI
> @@ -423,7 +430,7 @@ config DEBUG_LL_INCLUDE
> default "debug/mvebu.S" if DEBUG_MVEBU_UART
> default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
> default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
> - default "debug/sunxi.S" if DEBUG_SUNXI_UART1
> + default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
> default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
> DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
> default "mach/debug-macro.S"
> diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
> index 3bf61ca..04eb56d 100644
> --- a/arch/arm/include/debug/sunxi.S
> +++ b/arch/arm/include/debug/sunxi.S
> @@ -10,7 +10,10 @@
> * published by the Free Software Foundation.
> */
>
> -#ifdef CONFIG_DEBUG_SUNXI_UART1
> +#if defined(CONFIG_DEBUG_SUNXI_UART0)
> +#define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28000
> +#define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28000
> +#elif defined(CONFIG_DEBUG_SUNXI_UART1)
> #define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28400
> #define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28400
> #endif
>
Applied, thanks!
--
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2012-11-19 15:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-19 11:09 [PATCH 1/4] ARM: sunxi: Restructure sunxi dts/dtsi files Stefan Roese
2012-11-19 11:09 ` [PATCH 2/4] ARM: sunxi: Add earlyprintk support for UART0 (sun4i) Stefan Roese
2012-11-19 15:22 ` Maxime Ripard [this message]
2012-11-19 15:53 ` Arnd Bergmann
2012-11-19 11:09 ` [PATCH 3/4] ARM: sunxi: Add sun4i and cubieboard support Stefan Roese
2012-11-19 15:22 ` Maxime Ripard
2012-11-19 15:53 ` Arnd Bergmann
2012-11-19 11:09 ` [PATCH 4/4] ARM: sunxi: Add sunxi restart function via onchip watchdog Stefan Roese
2012-11-19 15:43 ` Maxime Ripard
2012-11-19 16:13 ` Stefan Roese
2012-11-19 15:55 ` Arnd Bergmann
2012-11-19 15:22 ` [PATCH 1/4] ARM: sunxi: Restructure sunxi dts/dtsi files Maxime Ripard
2012-11-19 15:52 ` Arnd Bergmann
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=50AA4EAF.4090500@free-electrons.com \
--to=maxime.ripard@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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