From: Alan Cox <alan@linux.intel.com>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel@lists.infradead.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-omap@vger.kernel.org, linux-serial@vger.kernel.org
Subject: Re: [PATCH 09/17] serial/8250: Limit the omap workarounds to omap1
Date: Tue, 11 Sep 2012 17:42:34 +0100 [thread overview]
Message-ID: <20120911174234.45919fd3@bob.linux.org.uk> (raw)
In-Reply-To: <20120911053104.29637.95283.stgit@muffinssi.local>
On Mon, 10 Sep 2012 22:31:04 -0700
Tony Lindgren <tony@atomide.com> wrote:
> These workarounds do not apply for CONFIG_ARCH_OMAP2PLUS at all,
> so let's make it just CONFIG_ARCH_OMAP1.
>
> This is needed to for ARM common zImage changes for
> omap2+ to avoid including plat and mach headers.
>
> Cc: Alan Cox <alan@linux.intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-serial@vger.kernel.org
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> drivers/tty/serial/8250/8250.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250.c
> b/drivers/tty/serial/8250/8250.c index 8123f78..5b3f2fe 100644
> --- a/drivers/tty/serial/8250/8250.c
> +++ b/drivers/tty/serial/8250/8250.c
> @@ -2336,7 +2336,7 @@ serial8250_do_set_termios(struct uart_port
> *port, struct ktermios *termios, serial_port_out(port, UART_EFR, efr);
> }
>
> -#ifdef CONFIG_ARCH_OMAP
> +#ifdef CONFIG_ARCH_OMAP1
> /* Workaround to enable 115200 baud on OMAP1510 internal
> ports */ if (cpu_is_omap1510() && is_omap_port(up)) {
> if (baud == 115200) {
> @@ -2426,7 +2426,7 @@ static unsigned int serial8250_port_size(struct
> uart_8250_port *pt) {
> if (pt->port.iotype == UPIO_AU)
> return 0x1000;
> -#ifdef CONFIG_ARCH_OMAP
> +#ifdef CONFIG_ARCH_OMAP1
> if (is_omap_port(pt))
> return 0x16 << pt->port.regshift;
> #endif
>
Acked-by: Alan Cox <alan@linux.intel.com>
Even better would be if for other cases is_omap_port and friends
returned 0...
WARNING: multiple messages have this Message-ID (diff)
From: alan@linux.intel.com (Alan Cox)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/17] serial/8250: Limit the omap workarounds to omap1
Date: Tue, 11 Sep 2012 17:42:34 +0100 [thread overview]
Message-ID: <20120911174234.45919fd3@bob.linux.org.uk> (raw)
In-Reply-To: <20120911053104.29637.95283.stgit@muffinssi.local>
On Mon, 10 Sep 2012 22:31:04 -0700
Tony Lindgren <tony@atomide.com> wrote:
> These workarounds do not apply for CONFIG_ARCH_OMAP2PLUS at all,
> so let's make it just CONFIG_ARCH_OMAP1.
>
> This is needed to for ARM common zImage changes for
> omap2+ to avoid including plat and mach headers.
>
> Cc: Alan Cox <alan@linux.intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-serial at vger.kernel.org
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> drivers/tty/serial/8250/8250.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250.c
> b/drivers/tty/serial/8250/8250.c index 8123f78..5b3f2fe 100644
> --- a/drivers/tty/serial/8250/8250.c
> +++ b/drivers/tty/serial/8250/8250.c
> @@ -2336,7 +2336,7 @@ serial8250_do_set_termios(struct uart_port
> *port, struct ktermios *termios, serial_port_out(port, UART_EFR, efr);
> }
>
> -#ifdef CONFIG_ARCH_OMAP
> +#ifdef CONFIG_ARCH_OMAP1
> /* Workaround to enable 115200 baud on OMAP1510 internal
> ports */ if (cpu_is_omap1510() && is_omap_port(up)) {
> if (baud == 115200) {
> @@ -2426,7 +2426,7 @@ static unsigned int serial8250_port_size(struct
> uart_8250_port *pt) {
> if (pt->port.iotype == UPIO_AU)
> return 0x1000;
> -#ifdef CONFIG_ARCH_OMAP
> +#ifdef CONFIG_ARCH_OMAP1
> if (is_omap_port(pt))
> return 0x16 << pt->port.regshift;
> #endif
>
Acked-by: Alan Cox <alan@linux.intel.com>
Even better would be if for other cases is_omap_port and friends
returned 0...
next prev parent reply other threads:[~2012-09-11 16:42 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 5:30 [PATCH 00/17] Resend of mach-omap2 sparse IRQ and hardware.h cleanup Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:30 ` [PATCH 01/17] ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:30 ` [PATCH 02/17] ARM: OMAP1: Define OMAP1_INT_I2C locally Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:30 ` [PATCH 03/17] ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:30 ` [PATCH 04/17] ARM: OMAP2+: Remove unused nand_irq for GPMC Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:30 ` [PATCH 05/17] ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:51 ` Felipe Balbi
2012-09-11 5:51 ` Felipe Balbi
2012-09-11 5:30 ` [PATCH 06/17] ARM: OMAP: Move gpio.h to include/linux/platform_data Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:30 ` [PATCH 07/17] Input: omap-keypad: Remove dependencies to mach includes Tony Lindgren
2012-09-11 5:30 ` Tony Lindgren
2012-09-11 5:57 ` Felipe Balbi
2012-09-11 5:57 ` Felipe Balbi
2012-09-11 6:16 ` Tony Lindgren
2012-09-11 6:16 ` Tony Lindgren
2012-09-11 17:56 ` Tony Lindgren
2012-09-11 17:56 ` Tony Lindgren
2012-09-11 18:27 ` Felipe Balbi
2012-09-11 18:27 ` Felipe Balbi
2012-09-12 4:39 ` Poddar, Sourav
2012-09-12 4:39 ` Poddar, Sourav
2012-09-12 6:39 ` Poddar, Sourav
2012-09-12 6:39 ` Poddar, Sourav
2012-09-11 5:31 ` [PATCH 08/17] W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 09/17] serial/8250: Limit the omap workarounds to omap1 Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 16:42 ` Alan Cox [this message]
2012-09-11 16:42 ` Alan Cox
2012-09-11 16:40 ` Tony Lindgren
2012-09-11 16:40 ` Tony Lindgren
2012-09-11 19:19 ` Alan Cox
2012-09-11 19:19 ` Alan Cox
2012-10-03 22:26 ` Tony Lindgren
2012-10-03 22:26 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 10/17] staging: tidspbridge: Prepare for irqs.h removal Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 11/17] ARM: OMAP2+: " Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 12/17] ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:59 ` Felipe Balbi
2012-09-11 5:59 ` Felipe Balbi
2012-09-11 5:31 ` [PATCH 13/17] ARM: OMAP1: Move plat/irqs.h to mach/irqs.h Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 14/17] ARM: OMAP: Remove unused old gpio-switch.h Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 15/17] ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+ Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 10:48 ` Wim Van Sebroeck
2012-09-11 5:31 ` [PATCH 16/17] ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2 Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
2012-09-11 5:31 ` [PATCH 17/17] ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 Tony Lindgren
2012-09-11 5:31 ` Tony Lindgren
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=20120911174234.45919fd3@bob.linux.org.uk \
--to=alan@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.