serial: sh-sci: Rename port SCI_PORT_RSCI->RSCI_PORT_SCIF16

Rename port SCI_PORT_RSCI->RSCI_PORT_SCIF16 to differentiate it from
RZ/G3E port that has 32-stage FIFO.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://patch.msgid.link/20251129164325.209213-12-biju.das.jz@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/rsci.c b/drivers/tty/serial/rsci.c
index 5a58c783fe8c2e1ab3d9504c9b5ec3adf67130b5..7f4cb04daeeb74a8b6622cbf19f7b44c8800f2e1 100644 (file)
--- a/drivers/tty/serial/rsci.c
+++ b/drivers/tty/serial/rsci.c
@@ -462,7 +462,7 @@ static const struct sci_port_ops rsci_port_ops = {
 };
 
 struct sci_of_data of_sci_rsci_data = {
-       .type = SCI_PORT_RSCI,
+       .type = RSCI_PORT_SCIF16,
        .ops = &rsci_port_ops,
        .uart_ops = &rsci_uart_ops,
        .params = &rsci_port_params,

diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci-common.h
index e3c028df14f1a437a346d9de3a128f953d0ebc1d..1b9480c7f4cb1487ade872eeaae0c92716b40770 100644 (file)
--- a/drivers/tty/serial/sh-sci-common.h
+++ b/drivers/tty/serial/sh-sci-common.h
@@ -7,7 +7,7 @@
 
 /* Private port IDs */
 enum SCI_PORT_TYPE {
-       SCI_PORT_RSCI = BIT(7) | 0,
+       RSCI_PORT_SCIF16 = BIT(7) | 0,
 };
 
 enum SCI_CLKS {

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index b7fef518a2b899fa98d8764eb261dc67cd6d28a1..624ef41701f278292fe4f8e418a0f477cabf8ebd 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1184,7 +1184,7 @@ static int sci_handle_errors(struct uart_port *port)
 
 static bool sci_is_rsci_type(u8 type)
 {
-       return (type == SCI_PORT_RSCI);
+       return (type == RSCI_PORT_SCIF16);
 }
 
 static int sci_handle_fifo_overrun(struct uart_port *port)
@@ -3178,7 +3178,7 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
 
        if (sci_port->type == PORT_HSCIF) {
                clk_names[SCI_SCK] = "hsck";
-       } else if (sci_port->type == SCI_PORT_RSCI) {
+       } else if (sci_port->type == RSCI_PORT_SCIF16) {
                clk_names[SCI_FCK] = "operation";
                clk_names[SCI_BRG_INT] = "bus";
        }
@@ -3190,7 +3190,7 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)
                if (IS_ERR(clk))
                        return PTR_ERR(clk);
 
-               if (!clk && sci_port->type == SCI_PORT_RSCI &&
+               if (!clk && sci_port->type == RSCI_PORT_SCIF16 &&
                    (i == SCI_FCK || i == SCI_BRG_INT))
                        return dev_err_probe(dev, -ENODEV, "failed to get %s\n", name);
 
@@ -3328,7 +3328,7 @@ static int sci_init_single(struct platform_device *dev,
                else
                        sci_port->rx_trigger = 8;
                break;
-       case SCI_PORT_RSCI:
+       case RSCI_PORT_SCIF16:
                sci_port->rx_trigger = 16;
                break;
        default: