| From 4c26c5a011ee46569cc9415dc27bf0541f0f42d7 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:41 +0100 |
| Subject: ARM: shmobile: r7s72100: 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 79fb5b4c6fc2222e5cf3899454b8c669a9f5c485) |
| (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-r7s72100.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c |
| index 81b995bb1a56..9c0b3a9d5f7a 100644 |
| --- a/arch/arm/mach-shmobile/setup-r7s72100.c |
| +++ b/arch/arm/mach-shmobile/setup-r7s72100.c |
| @@ -33,7 +33,6 @@ static const struct plat_sci_port scif##index##_platform_data = { \ |
| .type = PORT_SCIF, \ |
| .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, \ |
| .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \ |
| - .scbrr_algo_id = SCBRR_ALGO_2, \ |
| .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | \ |
| SCSCR_REIE, \ |
| }; \ |
| -- |
| 1.8.5.rc3 |
| |
