| Message ID | 1371461329-26467-1-git-send-email-horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
[ Cc Greg Kroah-Hartman <gregkh@linuxfoundation.org> ] On Mon, Jun 17, 2013 at 06:28:47PM +0900, Simon Horman wrote: > From: Ulrich Hecht <ulrich.hecht@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@gmail.com> > Acked-by: Paul Mundt <lethal@linux-sh.org> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Simon Horman <horms+renesas@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 ?
On Mon, Jun 17, 2013 at 07:13:18PM +0900, Simon Horman wrote: > [ Cc Greg Kroah-Hartman <gregkh@linuxfoundation.org> ] > > On Mon, Jun 17, 2013 at 06:28:47PM +0900, Simon Horman wrote: > > From: Ulrich Hecht <ulrich.hecht@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@gmail.com> > > Acked-by: Paul Mundt <lethal@linux-sh.org> > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Signed-off-by: Simon Horman <horms+renesas@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
Hi Olof, Hi Arnd, As requested the first patch is now includes an ack from Greg Kroah-Hartman. This pull request is based on renesas-soc2-for-v3.11, which you have already pulled, in order to satisfy dependencies. The second patch in the series is provided here because it has a build-time dependency in the first patch of the series. The third patch of the series could be applied independently, for instance as part of a fresh soc pull request, but it seems just as well to include it here. The following changes since commit 018222f5d32bc5ca9fd830aebfeed10f1be96c93: ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI (2013-06-12 21:07:38 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci-for-v3.11 for you to fetch changes up to c972f024c1097fa0798beafc21be1eeeba21ac34: ARM: shmobile: r8a7790: don't use external clock for SCIFs (2013-06-17 18:09:54 +0900) ---------------------------------------------------------------- Renesas sh-sci updates for v3.11 HSCIF support by Ulrich Hecht. ---------------------------------------------------------------- Ulrich Hecht (3): serial: sh-sci: HSCIF support ARM: shmobile: r8a7790: HSCIF support ARM: shmobile: r8a7790: don't use external clock for SCIFs arch/arm/mach-shmobile/setup-r8a7790.c | 16 ++++- drivers/tty/serial/sh-sci.c | 102 +++++++++++++++++++++++++++++--- include/linux/serial_sci.h | 12 +++- include/uapi/linux/serial_core.h | 3 + 4 files changed, 120 insertions(+), 13 deletions(-)