[PATCH 1/3] serial: sh-sci: HSCIF support

[Olof Johansson]

On Mon, Jun 17, 2013 at 07:13:18PM +0900, Simon Horman wrote:
> [ Cc Greg Kroah-Hartman <gregkh at linuxfoundation.org> ]
> 
> On Mon, Jun 17, 2013 at 06:28:47PM +0900, Simon Horman wrote:
> > From: Ulrich Hecht <ulrich.hecht at gmail.com>
> > 
> > Adds support for "High Speed Serial Communications Interface with FIFO",
> > essentially a SCIF with 128-byte FIFOs and more accurate baud rate
> > generator.
> > 
> > Signed-off-by: Ulrich Hecht <ulrich.hecht at gmail.com>
> > Acked-by: Paul Mundt <lethal at linux-sh.org>
> > Acked-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> > Signed-off-by: Simon Horman <horms+renesas at verge.net.au>
> 
> [ snip ]
> 
> > diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
> > index 74c2bf7..26eee07 100644
> > --- a/include/uapi/linux/serial_core.h
> > +++ b/include/uapi/linux/serial_core.h
> > @@ -226,4 +226,7 @@
> >  /* Rocketport EXPRESS/INFINITY */
> >  #define PORT_RP2	102
> >  
> > +/* SH-SCI */
> > +#define PORT_HSCIF	103
> > +
> >  #endif /* _UAPILINUX_SERIAL_CORE_H */
> 
> It seems that 103 conflicts with #define PORT_LPUART   103
> which is present in commit c9e2e946fb0b ("tty:
> serial: add Freescale lpuart driver support") which is
> in turn present in linux-next via tty-next.
> 
> Should I re-spin this patch using 104 for PORT_HSCIF ?

It's hard to predict what the final number will be. Best is to have Linus
handle the numbering when he resolves the final conflict; we'll remember to
point it out when we send the pull request.


-Olof