Merge tag 'renesas-sh-sci-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel...

Renesas sh-sci updates for v3.11

HSCIF support by Ulrich Hecht.

* tag 'renesas-sh-sci-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  serial: sh-sci: Initialise variables before access in sci_set_termios()
  ARM: shmobile: r8a7790: don't use external clock for SCIFs
  ARM: shmobile: r8a7790: HSCIF support
  serial: sh-sci: HSCIF support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
index 196bd7325df0b25be0d423c9ae27dd14f2e4ab07,6531f3d3a69690b95612466f75503d852a7b720c..28f94752b8ff0f2e86024d19c0f1471d02f9d1d5
--- 1/arch/arm/mach-shmobile/setup-r8a7790.c
--- 2/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@@ -98,12 -64,20 +98,20 @@@ void __init r8a7790_pinmux_init(void
  [index] = {                                           \
        SCIF_COMMON(PORT_SCIF, baseaddr, irq),          \
        .scbrr_algo_id  = SCBRR_ALGO_2,                 \
-       .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1,      \
+       .scscr = SCSCR_RE | SCSCR_TE,   \
  }
  
- enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1 };
+ #define HSCIF_DATA(index, baseaddr, irq)              \
+ [index] = {                                           \
+       SCIF_COMMON(PORT_HSCIF, baseaddr, irq),         \
+       .scbrr_algo_id  = SCBRR_ALGO_6,                 \
+       .scscr = SCSCR_RE | SCSCR_TE,   \
+ }
+ 
+ enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1,
+        HSCIF0, HSCIF1 };
  
 -static const struct plat_sci_port scif[] = {
 +static struct plat_sci_port scif[] __initdata = {
        SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
        SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */
        SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */