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: rsci: Rename early_console data, port_params and callback() names

Rename rsci_early_console_setup()->rsci_rzt2h_early_console_setup(),
the early_console data of_sci_rsci_data->of_rsci_rzt2h_data and the
port_params rsci_port_params->rsci_rzt2h_port_params to support RZ/G3E
RSCI that uses different data and callback().

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-17-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 068b862f bbcd508c

+9 -9
+7 -7
drivers/tty/serial/rsci.c
··· 419 419 .poll_sent_bits = CSR_TDRE | CSR_TEND, 420 420 }; 421 421 422 - static const struct sci_port_params rsci_port_params = { 422 + static const struct sci_port_params rsci_rzt2h_port_params = { 423 423 .fifosize = 16, 424 424 .overrun_reg = CSR, 425 425 .overrun_mask = CSR_ORER, ··· 461 461 .shutdown_complete = rsci_shutdown_complete, 462 462 }; 463 463 464 - struct sci_of_data of_sci_rsci_data = { 464 + struct sci_of_data of_rsci_rzt2h_data = { 465 465 .type = RSCI_PORT_SCIF16, 466 466 .ops = &rsci_port_ops, 467 467 .uart_ops = &rsci_uart_ops, 468 - .params = &rsci_port_params, 468 + .params = &rsci_rzt2h_port_params, 469 469 }; 470 470 471 471 #ifdef CONFIG_SERIAL_SH_SCI_EARLYCON 472 472 473 - static int __init rsci_early_console_setup(struct earlycon_device *device, 474 - const char *opt) 473 + static int __init rsci_rzt2h_early_console_setup(struct earlycon_device *device, 474 + const char *opt) 475 475 { 476 - return scix_early_console_setup(device, &of_sci_rsci_data); 476 + return scix_early_console_setup(device, &of_rsci_rzt2h_data); 477 477 } 478 478 479 - OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_early_console_setup); 479 + OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_rzt2h_early_console_setup); 480 480 481 481 #endif /* CONFIG_SERIAL_SH_SCI_EARLYCON */ 482 482
+1 -1
drivers/tty/serial/rsci.h
··· 5 5 6 6 #include "sh-sci-common.h" 7 7 8 - extern struct sci_of_data of_sci_rsci_data; 8 + extern struct sci_of_data of_rsci_rzt2h_data; 9 9 10 10 #endif /* __RSCI_H__ */
+1 -1
drivers/tty/serial/sh-sci.c
··· 3664 3664 #ifdef CONFIG_SERIAL_RSCI 3665 3665 { 3666 3666 .compatible = "renesas,r9a09g077-rsci", 3667 - .data = &of_sci_rsci_data, 3667 + .data = &of_rsci_rzt2h_data, 3668 3668 }, 3669 3669 #endif /* CONFIG_SERIAL_RSCI */ 3670 3670 /* Family-specific types */