| From b1a12fad3a5f04582ae616c913a849fe44d8e1a8 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Thu, 24 Apr 2014 19:26:16 -0700 |
| Subject: Revert "serial: sh-sci: Add device tree support for r8a7779" |
| |
| This reverts commit fcbee4d49f30eb0eaa83a62e6a3cab5a892ed93f. |
| |
| It wasn't quite ready to go in yet, sorry about that. |
| |
| Cc: Simon Horman <horms@verge.net.au> |
| Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 2aafb3864b9fa5ce83250537d940f973ef37b8dc) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| .../devicetree/bindings/serial/renesas,sci-serial.txt | 1 - |
| drivers/tty/serial/sh-sci.c | 10 +--------- |
| 2 files changed, 1 insertion(+), 10 deletions(-) |
| |
| diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt |
| index bba86de1a094..53e6c175db6c 100644 |
| --- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt |
| +++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt |
| @@ -12,7 +12,6 @@ Required properties: |
| - "renesas,scifa-r8a7791" for R8A7791 (R-Car M2) SCIFA compatible UART. |
| - "renesas,scifb-r8a7791" for R8A7791 (R-Car M2) SCIFB compatible UART. |
| - "renesas,hscif-r8a7791" for R8A7791 (R-Car M2) HSCIF compatible UART. |
| - - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART. |
| - "renesas,scif" for generic SCIF compatible UART. |
| - "renesas,scifa" for generic SCIFA compatible UART. |
| - "renesas,scifb" for generic SCIFB compatible UART. |
| diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c |
| index 3b5d2f679946..88236da0ddf7 100644 |
| --- a/drivers/tty/serial/sh-sci.c |
| +++ b/drivers/tty/serial/sh-sci.c |
| @@ -2419,7 +2419,6 @@ static int sci_remove(struct platform_device *dev) |
| struct sci_port_info { |
| unsigned int type; |
| unsigned int regtype; |
| - unsigned int scscr_extra; |
| }; |
| |
| static const struct of_device_id of_sci_match[] = { |
| @@ -2430,13 +2429,6 @@ static const struct of_device_id of_sci_match[] = { |
| .regtype = SCIx_SH4_SCIF_REGTYPE, |
| }, |
| }, { |
| - .compatible = "renesas,scif-r8a7779", |
| - .data = (void *)&(const struct sci_port_info) { |
| - .type = PORT_SCIF, |
| - .regtype = SCIx_SH4_SCIF_REGTYPE, |
| - .scscr_extra = SCSCR_CKE1, |
| - }, |
| - }, { |
| .compatible = "renesas,scifa", |
| .data = &(const struct sci_port_info) { |
| .type = PORT_SCIFA, |
| @@ -2496,7 +2488,7 @@ sci_parse_dt(struct platform_device *pdev, unsigned int *dev_id) |
| p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; |
| p->type = info->type; |
| p->regtype = info->regtype; |
| - p->scscr = SCSCR_RE | SCSCR_TE | info->scscr_extra; |
| + p->scscr = SCSCR_RE | SCSCR_TE; |
| |
| return p; |
| } |
| -- |
| 2.1.2 |
| |
