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

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Biju Das and committed by
Greg Kroah-Hartman d53f4aa9 7d8b226b

+6 -6
+1 -1
drivers/tty/serial/rsci.c
··· 462 462 }; 463 463 464 464 struct sci_of_data of_sci_rsci_data = { 465 - .type = SCI_PORT_RSCI, 465 + .type = RSCI_PORT_SCIF16, 466 466 .ops = &rsci_port_ops, 467 467 .uart_ops = &rsci_uart_ops, 468 468 .params = &rsci_port_params,
+1 -1
drivers/tty/serial/sh-sci-common.h
··· 7 7 8 8 /* Private port IDs */ 9 9 enum SCI_PORT_TYPE { 10 - SCI_PORT_RSCI = BIT(7) | 0, 10 + RSCI_PORT_SCIF16 = BIT(7) | 0, 11 11 }; 12 12 13 13 enum SCI_CLKS {
+4 -4
drivers/tty/serial/sh-sci.c
··· 1184 1184 1185 1185 static bool sci_is_rsci_type(u8 type) 1186 1186 { 1187 - return (type == SCI_PORT_RSCI); 1187 + return (type == RSCI_PORT_SCIF16); 1188 1188 } 1189 1189 1190 1190 static int sci_handle_fifo_overrun(struct uart_port *port) ··· 3178 3178 3179 3179 if (sci_port->type == PORT_HSCIF) { 3180 3180 clk_names[SCI_SCK] = "hsck"; 3181 - } else if (sci_port->type == SCI_PORT_RSCI) { 3181 + } else if (sci_port->type == RSCI_PORT_SCIF16) { 3182 3182 clk_names[SCI_FCK] = "operation"; 3183 3183 clk_names[SCI_BRG_INT] = "bus"; 3184 3184 } ··· 3190 3190 if (IS_ERR(clk)) 3191 3191 return PTR_ERR(clk); 3192 3192 3193 - if (!clk && sci_port->type == SCI_PORT_RSCI && 3193 + if (!clk && sci_port->type == RSCI_PORT_SCIF16 && 3194 3194 (i == SCI_FCK || i == SCI_BRG_INT)) 3195 3195 return dev_err_probe(dev, -ENODEV, "failed to get %s\n", name); 3196 3196 ··· 3328 3328 else 3329 3329 sci_port->rx_trigger = 8; 3330 3330 break; 3331 - case SCI_PORT_RSCI: 3331 + case RSCI_PORT_SCIF16: 3332 3332 sci_port->rx_trigger = 16; 3333 3333 break; 3334 3334 default: