| Message ID | 20120911053104.29637.95283.stgit@muffinssi.local (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Alan Cox <alan@linux.intel.com> [120911 09:25]: > 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> Thanks. > Even better would be if for other cases is_omap_port and friends > returned 0... Yes it seems that those macros could be moved from plat-omap/serial.h to live in drivers/tty/serial/8250/8250.h? Or do you have some better place in mind? Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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... -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Even better would be if for other cases is_omap_port and friends > > returned 0... > > Yes it seems that those macros could be moved from plat-omap/serial.h > to live in drivers/tty/serial/8250/8250.h? Or do you have some better > place in mind? I've not looked at it enough to decide if it's doable or not. I'm happy either way - both patches are progress the right way! -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Alan Cox <alan@linux.intel.com> [120911 12:02]: > > > Even better would be if for other cases is_omap_port and friends > > > returned 0... > > > > Yes it seems that those macros could be moved from plat-omap/serial.h > > to live in drivers/tty/serial/8250/8250.h? Or do you have some better > > place in mind? > > I've not looked at it enough to decide if it's doable or not. I'm happy > either way - both patches are progress the right way! FYI, I'll send something along these lines as a separate patch as "[PATCH] tty/serial/8250: Make omap hardware workarounds local to 8250.h" Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html