Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+1 -10
-1
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
··· 12 12 - "renesas,scifa-r8a7791" for R8A7791 (R-Car M2) SCIFA compatible UART. 13 13 - "renesas,scifb-r8a7791" for R8A7791 (R-Car M2) SCIFB compatible UART. 14 14 - "renesas,hscif-r8a7791" for R8A7791 (R-Car M2) HSCIF compatible UART. 15 - - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART. 16 15 - "renesas,scif" for generic SCIF compatible UART. 17 16 - "renesas,scifa" for generic SCIFA compatible UART. 18 17 - "renesas,scifb" for generic SCIFB compatible UART.
+1 -9
drivers/tty/serial/sh-sci.c
··· 2419 2419 struct sci_port_info { 2420 2420 unsigned int type; 2421 2421 unsigned int regtype; 2422 - unsigned int scscr_extra; 2423 2422 }; 2424 2423 2425 2424 static const struct of_device_id of_sci_match[] = { ··· 2427 2428 .data = &(const struct sci_port_info) { 2428 2429 .type = PORT_SCIF, 2429 2430 .regtype = SCIx_SH4_SCIF_REGTYPE, 2430 - }, 2431 - }, { 2432 - .compatible = "renesas,scif-r8a7779", 2433 - .data = (void *)&(const struct sci_port_info) { 2434 - .type = PORT_SCIF, 2435 - .regtype = SCIx_SH4_SCIF_REGTYPE, 2436 - .scscr_extra = SCSCR_CKE1, 2437 2431 }, 2438 2432 }, { 2439 2433 .compatible = "renesas,scifa", ··· 2488 2496 p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; 2489 2497 p->type = info->type; 2490 2498 p->regtype = info->regtype; 2491 - p->scscr = SCSCR_RE | SCSCR_TE | info->scscr_extra; 2499 + p->scscr = SCSCR_RE | SCSCR_TE; 2492 2500 2493 2501 return p; 2494 2502 }