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

[linux.git] / arch / arm / mach-shmobile / setup-r8a7790.c

diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 196bd7325df0b25be0d423c9ae27dd14f2e4ab07..28f94752b8ff0f2e86024d19c0f1471d02f9d1d5 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -98,10 +98,18 @@ 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 struct plat_sci_port scif[] __initdata = {
        SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
@@ -112,6 +120,8 @@ static struct plat_sci_port scif[] __initdata = {
        SCIFA_DATA(SCIFA2, 0xe6c60000, gic_spi(151)), /* SCIFA2 */
        SCIF_DATA(SCIF0, 0xe6e60000, gic_spi(152)), /* SCIF0 */
        SCIF_DATA(SCIF1, 0xe6e68000, gic_spi(153)), /* SCIF1 */
+       HSCIF_DATA(HSCIF0, 0xe62c0000, gic_spi(154)), /* HSCIF0 */
+       HSCIF_DATA(HSCIF1, 0xe62c8000, gic_spi(155)), /* HSCIF1 */
 };
 
 static inline void r8a7790_register_scif(int idx)
@@ -149,6 +159,8 @@ void __init r8a7790_add_standard_devices(void)
        r8a7790_register_scif(SCIFA2);
        r8a7790_register_scif(SCIF0);
        r8a7790_register_scif(SCIF1);
+       r8a7790_register_scif(HSCIF0);
+       r8a7790_register_scif(HSCIF1);
        r8a7790_register_irqc(0);
 }