* [PATCH] ARM: Tegra: Force PORT_TEGRA as the UART type
@ 2011-08-08 21:01 Stephen Warren
2011-08-09 18:26 ` Marc Dietrich
2011-08-09 19:30 ` Olof Johansson
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Warren @ 2011-08-08 21:01 UTC (permalink / raw)
To: Colin Cross, Erik Gilling, Olof Johansson, Arnd Bergmann
Cc: Marc Dietrich, linux-tegra, linux-arm-kernel, linux-kernel,
Stephen Warren
8250.c recently gained an explicit PORT_TEGRA port type. Specifically
request this in all Tegra boards' UART platform data.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
NOTE: This depends on "[PATCH 1/5] ARM: tegra: paz00: add support serial
port on JP1", which was recently posted by Marc Dietrich, since that added
one of the platform data array entries being modified by this patch.
arch/arm/mach-tegra/board-harmony.c | 3 ++-
arch/arm/mach-tegra/board-paz00.c | 6 ++++--
arch/arm/mach-tegra/board-seaboard.c | 3 ++-
arch/arm/mach-tegra/board-trimslice.c | 3 ++-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index f528a5a..987dab5 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -49,7 +49,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
.membase = IO_ADDRESS(TEGRA_UARTD_BASE),
.mapbase = TEGRA_UARTD_BASE,
.irq = INT_UARTD,
- .flags = UPF_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+ .type = PORT_TEGRA,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index b7494c2..c6a6d82 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -49,7 +49,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
.membase = IO_ADDRESS(TEGRA_UARTA_BASE),
.mapbase = TEGRA_UARTA_BASE,
.irq = INT_UARTA,
- .flags = UPF_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+ .type = PORT_TEGRA,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
@@ -58,7 +59,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
.membase = IO_ADDRESS(TEGRA_UARTD_BASE),
.mapbase = TEGRA_UARTD_BASE,
.irq = INT_UARTD,
- .flags = UPF_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+ .type = PORT_TEGRA,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
index 237a94a..25446df 100644
--- a/arch/arm/mach-tegra/board-seaboard.c
+++ b/arch/arm/mach-tegra/board-seaboard.c
@@ -44,7 +44,8 @@
static struct plat_serial8250_port debug_uart_platform_data[] = {
{
/* Memory and IRQ filled in before registration */
- .flags = UPF_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+ .type = PORT_TEGRA,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index 89a6d2a..91875b9 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@ -46,7 +46,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
.membase = IO_ADDRESS(TEGRA_UARTA_BASE),
.mapbase = TEGRA_UARTA_BASE,
.irq = INT_UARTA,
- .flags = UPF_BOOT_AUTOCONF,
+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
+ .type = PORT_TEGRA,
.iotype = UPIO_MEM,
.regshift = 2,
.uartclk = 216000000,
--
1.7.0.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: Tegra: Force PORT_TEGRA as the UART type
2011-08-08 21:01 [PATCH] ARM: Tegra: Force PORT_TEGRA as the UART type Stephen Warren
@ 2011-08-09 18:26 ` Marc Dietrich
2011-08-09 19:30 ` Olof Johansson
1 sibling, 0 replies; 3+ messages in thread
From: Marc Dietrich @ 2011-08-09 18:26 UTC (permalink / raw)
To: Stephen Warren
Cc: Colin Cross, Erik Gilling, Olof Johansson, Arnd Bergmann,
linux-tegra, linux-arm-kernel, linux-kernel
Hi Stephen,
Am Montag 08 August 2011, 23:01:05 schrieb Stephen Warren:
> 8250.c recently gained an explicit PORT_TEGRA port type. Specifically
> request this in all Tegra boards' UART platform data.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Tested the paz00 part and found no issues. So for board-paz00:
Acked-By: Marc Dietrich <marvin24@gmx.de>
> ---
> NOTE: This depends on "[PATCH 1/5] ARM: tegra: paz00: add support serial
> port on JP1", which was recently posted by Marc Dietrich, since that added
> one of the platform data array entries being modified by this patch.
>
> arch/arm/mach-tegra/board-harmony.c | 3 ++-
> arch/arm/mach-tegra/board-paz00.c | 6 ++++--
> arch/arm/mach-tegra/board-seaboard.c | 3 ++-
> arch/arm/mach-tegra/board-trimslice.c | 3 ++-
> 4 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
> index f528a5a..987dab5 100644
> --- a/arch/arm/mach-tegra/board-harmony.c
> +++ b/arch/arm/mach-tegra/board-harmony.c
> @@ -49,7 +49,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
> .membase = IO_ADDRESS(TEGRA_UARTD_BASE),
> .mapbase = TEGRA_UARTD_BASE,
> .irq = INT_UARTD,
> - .flags = UPF_BOOT_AUTOCONF,
> + .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
> + .type = PORT_TEGRA,
> .iotype = UPIO_MEM,
> .regshift = 2,
> .uartclk = 216000000,
> diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
> index b7494c2..c6a6d82 100644
> --- a/arch/arm/mach-tegra/board-paz00.c
> +++ b/arch/arm/mach-tegra/board-paz00.c
> @@ -49,7 +49,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
> .membase = IO_ADDRESS(TEGRA_UARTA_BASE),
> .mapbase = TEGRA_UARTA_BASE,
> .irq = INT_UARTA,
> - .flags = UPF_BOOT_AUTOCONF,
> + .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
> + .type = PORT_TEGRA,
> .iotype = UPIO_MEM,
> .regshift = 2,
> .uartclk = 216000000,
> @@ -58,7 +59,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
> .membase = IO_ADDRESS(TEGRA_UARTD_BASE),
> .mapbase = TEGRA_UARTD_BASE,
> .irq = INT_UARTD,
> - .flags = UPF_BOOT_AUTOCONF,
> + .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
> + .type = PORT_TEGRA,
> .iotype = UPIO_MEM,
> .regshift = 2,
> .uartclk = 216000000,
> diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
> index 237a94a..25446df 100644
> --- a/arch/arm/mach-tegra/board-seaboard.c
> +++ b/arch/arm/mach-tegra/board-seaboard.c
> @@ -44,7 +44,8 @@
> static struct plat_serial8250_port debug_uart_platform_data[] = {
> {
> /* Memory and IRQ filled in before registration */
> - .flags = UPF_BOOT_AUTOCONF,
> + .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
> + .type = PORT_TEGRA,
> .iotype = UPIO_MEM,
> .regshift = 2,
> .uartclk = 216000000,
> diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
> index 89a6d2a..91875b9 100644
> --- a/arch/arm/mach-tegra/board-trimslice.c
> +++ b/arch/arm/mach-tegra/board-trimslice.c
> @@ -46,7 +46,8 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
> .membase = IO_ADDRESS(TEGRA_UARTA_BASE),
> .mapbase = TEGRA_UARTA_BASE,
> .irq = INT_UARTA,
> - .flags = UPF_BOOT_AUTOCONF,
> + .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
> + .type = PORT_TEGRA,
> .iotype = UPIO_MEM,
> .regshift = 2,
> .uartclk = 216000000,
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: Tegra: Force PORT_TEGRA as the UART type
2011-08-08 21:01 [PATCH] ARM: Tegra: Force PORT_TEGRA as the UART type Stephen Warren
2011-08-09 18:26 ` Marc Dietrich
@ 2011-08-09 19:30 ` Olof Johansson
1 sibling, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2011-08-09 19:30 UTC (permalink / raw)
To: Stephen Warren
Cc: Colin Cross, Erik Gilling, Arnd Bergmann, Marc Dietrich,
linux-tegra, linux-arm-kernel, linux-kernel
On Mon, Aug 08, 2011 at 03:01:05PM -0600, Stephen Warren wrote:
> 8250.c recently gained an explicit PORT_TEGRA port type. Specifically
> request this in all Tegra boards' UART platform data.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Thanks, applied to boards-for-3.2.
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-09 19:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-08 21:01 [PATCH] ARM: Tegra: Force PORT_TEGRA as the UART type Stephen Warren
2011-08-09 18:26 ` Marc Dietrich
2011-08-09 19:30 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®