| From b1ee42e098a83b388387ba56fc5307d8adcc2257 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:47 +0100 |
| Subject: ARM: shmobile: r8a7791: Don't set plat_sci_port scbrr_algo_id field |
| |
| The field will be removed from the sh-sci driver. Don't set it and let |
| the driver handle baud rate calculation internally. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit f72ed4beb198eb25c8532e76addc0034ae2aa8c7) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7791.c | 9 ++++----- |
| 1 file changed, 4 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c |
| index f15b53786713..e28404e43860 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7791.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7791.c |
| @@ -84,11 +84,10 @@ void __init r8a7791_pinmux_init(void) |
| r8a7791_register_gpio(7); |
| } |
| |
| -#define __R8A7791_SCIF(scif_type, algo, index, baseaddr, irq) \ |
| +#define __R8A7791_SCIF(scif_type, index, baseaddr, irq) \ |
| static struct plat_sci_port scif##index##_platform_data = { \ |
| .type = scif_type, \ |
| .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \ |
| - .scbrr_algo_id = algo, \ |
| .scscr = SCSCR_RE | SCSCR_TE, \ |
| }; \ |
| \ |
| @@ -98,13 +97,13 @@ static struct resource scif##index##_resources[] = { \ |
| } |
| |
| #define R8A7791_SCIF(index, baseaddr, irq) \ |
| - __R8A7791_SCIF(PORT_SCIF, SCBRR_ALGO_2, index, baseaddr, irq) |
| + __R8A7791_SCIF(PORT_SCIF, index, baseaddr, irq) |
| |
| #define R8A7791_SCIFA(index, baseaddr, irq) \ |
| - __R8A7791_SCIF(PORT_SCIFA, SCBRR_ALGO_4, index, baseaddr, irq) |
| + __R8A7791_SCIF(PORT_SCIFA, index, baseaddr, irq) |
| |
| #define R8A7791_SCIFB(index, baseaddr, irq) \ |
| - __R8A7791_SCIF(PORT_SCIFB, SCBRR_ALGO_4, index, baseaddr, irq) |
| + __R8A7791_SCIF(PORT_SCIFB, index, baseaddr, irq) |
| |
| R8A7791_SCIFA(0, 0xe6c40000, gic_spi(144)); /* SCIFA0 */ |
| R8A7791_SCIFA(1, 0xe6c50000, gic_spi(145)); /* SCIFA1 */ |
| -- |
| 1.8.5.rc3 |
| |
