Patchwork [GIT,PULL,0/2] Renesas sh-sci updates for v3.11

login
register
mail settings
Submitter Simon Horman
Date June 13, 2013, 7 a.m.
Message ID <1371106854-25560-1-git-send-email-horms+renesas@verge.net.au>
Download mbox
Permalink /patch/250995/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git sh-sci

Comments

Simon Horman - June 13, 2013, 7 a.m.
Hi Olof, Hi Arnd,

I have included the r8a7790 change in this patch as it
depends on the first change in the pull-request but nothing else.

This pull request will cause some conflicts though I believe all
of them are not difficult to resolve. The renesas-next-20130613 tag in
my tree illustrates how I have handled the conflicts with
both changes already in arm-soc and changes I intend to send
pull requests for in the near future.

The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:

  Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git sh-sci

for you to fetch changes up to d1b6515e2eeaac48eff47bf4987f106a982e14f3:

  ARM: shmobile: r8a7790: don't use external clock for SCIFs (2013-06-11 17:24:08 +0900)

----------------------------------------------------------------
Renesas sh-sci updates for v3.11

HSCIF support by Ulrich Hecht.

----------------------------------------------------------------
Ulrich Hecht (2):
      serial: sh-sci: 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(-)
Olof Johansson - June 15, 2013, 1:03 a.m.
On Thu, Jun 13, 2013 at 04:00:53PM +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>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

I think this should go through Greg K-H, or at least get an Acked-by from him.

Especially since it adds and allocates new UAPI IDs.


-Olof
Olof Johansson - June 15, 2013, 1:04 a.m.
On Thu, Jun 13, 2013 at 04:00:54PM +0900, Simon Horman wrote:
> From: Ulrich Hecht <ulrich.hecht@gmail.com>
> 
> This is an external component and may or may not be there, while the
> internal clock always works.
> 
> Signed-off-by: Ulrich Hecht <ulrich.hecht@gmail.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Looks like this one is appropriate for arm-soc merging, but I'll hold off
pulling this branch until the serial driver piece has been acked or dropped (to
be merged by Greg).


-Olof
Simon Horman - June 17, 2013, 2:25 a.m.
On Fri, Jun 14, 2013 at 06:04:56PM -0700, Olof Johansson wrote:
> On Thu, Jun 13, 2013 at 04:00:54PM +0900, Simon Horman wrote:
> > From: Ulrich Hecht <ulrich.hecht@gmail.com>
> > 
> > This is an external component and may or may not be there, while the
> > internal clock always works.
> > 
> > Signed-off-by: Ulrich Hecht <ulrich.hecht@gmail.com>
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Looks like this one is appropriate for arm-soc merging, but I'll hold off
> pulling this branch until the serial driver piece has been acked or dropped (to
> be merged by Greg).

This patch has a build-time dependency on the serial driver piece,
which is why I included both patches in the same pull-request.

I'll talk with Greg to see how he would like to move this forwards.