Commit f421ed33 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "serial: sh-sci: Add support for RZ/G2L SoC" 



This reverts commit 064b6e47 as it
wasn't quite ready yet :(

Cc: Biju Das <biju.das.jz@bp.renesas.com>
CC: Geert Uytterhoeven <geert+renesas@glider.be>
Reported-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b50155c6

drivers/tty/serial/sh-sci.c

+0 −11
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = { 
			[SCFDR]		= { 0x0E, 16 },

			[SCSPTR]	= { 0x10, 16 },

			[SCLSR]		= { 0x12, 16 },

			[SEMR]		= { 0x14, 8 },

		},

		.fifosize = 16,

		.overrun_reg = SCLSR,
@@ -2528,8 +2527,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, 
			case 27: smr_val |= SCSMR_SRC_27; break;

			}

		smr_val |= cks;

		if (sci_getreg(port, SEMR)->size)

			serial_port_out(port, SEMR, 0);

		serial_port_out(port, SCSCR, scr_val | s->hscif_tot);

		serial_port_out(port, SCSMR, smr_val);

		serial_port_out(port, SCBRR, brr);
@@ -2564,8 +2561,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, 
		scr_val = s->cfg->scscr & (SCSCR_CKE1 | SCSCR_CKE0);

		smr_val |= serial_port_in(port, SCSMR) &

			   (SCSMR_CKEDG | SCSMR_SRC_MASK | SCSMR_CKS);

		if (sci_getreg(port, SEMR)->size)

			serial_port_out(port, SEMR, 0);

		serial_port_out(port, SCSCR, scr_val | s->hscif_tot);

		serial_port_out(port, SCSMR, smr_val);

	}
@@ -3175,10 +3170,6 @@ static const struct of_device_id of_sci_match[] = { 
		.compatible = "renesas,scif-r7s9210",

		.data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE),

	},

	{

		.compatible = "renesas,scif-r9a07g044",

		.data = SCI_OF_DATA(PORT_SCIF, SCIx_RZ_SCIFA_REGTYPE),

	},

	/* Family-specific types */

	{

		.compatible = "renesas,rcar-gen1-scif",
@@ -3461,7 +3452,6 @@ static int __init rzscifa_early_console_setup(struct earlycon_device *device, 
	port_cfg.regtype = SCIx_RZ_SCIFA_REGTYPE;

	return early_console_setup(device, PORT_SCIF);

}



static int __init scifa_early_console_setup(struct earlycon_device *device,

					  const char *opt)

{
@@ -3481,7 +3471,6 @@ static int __init hscif_early_console_setup(struct earlycon_device *device, 
OF_EARLYCON_DECLARE(sci, "renesas,sci", sci_early_console_setup);

OF_EARLYCON_DECLARE(scif, "renesas,scif", scif_early_console_setup);

OF_EARLYCON_DECLARE(scif, "renesas,scif-r7s9210", rzscifa_early_console_setup);

OF_EARLYCON_DECLARE(scif, "renesas,scif-r9a07g044", rzscifa_early_console_setup);

OF_EARLYCON_DECLARE(scifa, "renesas,scifa", scifa_early_console_setup);

OF_EARLYCON_DECLARE(scifb, "renesas,scifb", scifb_early_console_setup);

OF_EARLYCON_DECLARE(hscif, "renesas,hscif", hscif_early_console_setup);

drivers/tty/serial/sh-sci.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ enum { 
	SCCKS,				/* BRG Clock Select Register */

	HSRTRGR,			/* Rx FIFO Data Count Trigger Register */

	HSTTRGR,			/* Tx FIFO Data Count Trigger Register */

	SEMR,				/* Serial extended mode register */



	SCIx_NR_REGS,

};