diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-24 19:26:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-24 19:26:16 -0700 |
| commit | 2aafb3864b9fa5ce83250537d940f973ef37b8dc (patch) | |
| tree | 2cbfa2595f1bc09a5df9eeb5c9c21de33f68830a /drivers/tty | |
| parent | 8ef0ed95ee040a5cd25325dddcb8292c34bec33e (diff) | |
| download | linux-2aafb3864b9fa5ce83250537d940f973ef37b8dc.tar.bz2 | |
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 10 |
1 files changed, 1 insertions, 9 deletions
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; } |