From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/3] serial: sh-sci: HSCIF support
Date: Mon, 17 Jun 2013 10:13:18 +0000 [thread overview]
Message-ID: <20130617101318.GA28277@verge.net.au> (raw)
In-Reply-To: <1371461329-26467-2-git-send-email-horms+renesas@verge.net.au>
[ 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 ?
WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] serial: sh-sci: HSCIF support
Date: Mon, 17 Jun 2013 19:13:18 +0900 [thread overview]
Message-ID: <20130617101318.GA28277@verge.net.au> (raw)
In-Reply-To: <1371461329-26467-2-git-send-email-horms+renesas@verge.net.au>
[ 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 ?
next prev parent reply other threads:[~2013-06-17 10:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 9:28 [GIT PULL v3 0/3] Renesas sh-sci updates for v3.11 Simon Horman
2013-06-17 9:28 ` Simon Horman
2013-06-17 9:28 ` [PATCH 1/3] serial: sh-sci: HSCIF support Simon Horman
2013-06-17 9:28 ` Simon Horman
2013-06-17 10:13 ` Simon Horman [this message]
2013-06-17 10:13 ` Simon Horman
2013-06-17 17:31 ` Olof Johansson
2013-06-17 17:31 ` Olof Johansson
2013-06-17 9:28 ` [PATCH 2/3] ARM: shmobile: r8a7790: " Simon Horman
2013-06-17 9:28 ` Simon Horman
2013-06-17 9:28 ` [PATCH 3/3] ARM: shmobile: r8a7790: don't use external clock for SCIFs Simon Horman
2013-06-17 9:28 ` Simon Horman
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=20130617101318.GA28277@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/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.