| From a6d416b5d5e41fa04fc00cd156c6c5615eff5da3 Mon Sep 17 00:00:00 2001 |
| From: Ulrich Hecht <ulrich.hecht@gmail.com> |
| Date: Fri, 31 May 2013 17:57:02 +0200 |
| Subject: ARM: shmobile: r8a7790: HSCIF support |
| |
| Adds support for HSCIF0 and HSCIF1 on the r8a7790. |
| |
| Signed-off-by: Ulrich Hecht <ulrich.hecht@gmail.com> |
| [ horms+renesas@verge.net.au this is the setup-r8a7790.c |
| which I somehow miss-applied as part of another patch. |
| The clock-r8a7790.c portion of this patch has already been merged. ] |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit d44f8308cf7a65f4c97a041da07d872aefe47ca7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7790.c | 14 +++++++++++++- |
| 1 file changed, 13 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c |
| index 196bd732..2d0c9bfd 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7790.c |
| @@ -101,7 +101,15 @@ void __init r8a7790_pinmux_init(void) |
| .scscr = SCSCR_RE | SCSCR_TE | SCSCR_CKE1, \ |
| } |
| |
| -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); |
| } |
| |
| -- |
| 1.8.4.3.gca3854a |
| |