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>
This commit is contained in:
Biju Das 2025-11-29 16:43:12 +00:00 committed by Greg Kroah-Hartman
parent bbcd508c84
commit 068b862f50
3 changed files with 9 additions and 9 deletions

View File

@ -419,7 +419,7 @@ static const struct sci_port_params_bits rsci_port_param_bits = {
.poll_sent_bits = CSR_TDRE | CSR_TEND,
};
static const struct sci_port_params rsci_port_params = {
static const struct sci_port_params rsci_rzt2h_port_params = {
.fifosize = 16,
.overrun_reg = CSR,
.overrun_mask = CSR_ORER,
@ -461,22 +461,22 @@ static const struct sci_port_ops rsci_port_ops = {
.shutdown_complete = rsci_shutdown_complete,
};
struct sci_of_data of_sci_rsci_data = {
struct sci_of_data of_rsci_rzt2h_data = {
.type = RSCI_PORT_SCIF16,
.ops = &rsci_port_ops,
.uart_ops = &rsci_uart_ops,
.params = &rsci_port_params,
.params = &rsci_rzt2h_port_params,
};
#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON
static int __init rsci_early_console_setup(struct earlycon_device *device,
const char *opt)
static int __init rsci_rzt2h_early_console_setup(struct earlycon_device *device,
const char *opt)
{
return scix_early_console_setup(device, &of_sci_rsci_data);
return scix_early_console_setup(device, &of_rsci_rzt2h_data);
}
OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_early_console_setup);
OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_rzt2h_early_console_setup);
#endif /* CONFIG_SERIAL_SH_SCI_EARLYCON */

View File

@ -5,6 +5,6 @@
#include "sh-sci-common.h"
extern struct sci_of_data of_sci_rsci_data;
extern struct sci_of_data of_rsci_rzt2h_data;
#endif /* __RSCI_H__ */

View File

@ -3664,7 +3664,7 @@ static const struct of_device_id of_sci_match[] __maybe_unused = {
#ifdef CONFIG_SERIAL_RSCI
{
.compatible = "renesas,r9a09g077-rsci",
.data = &of_sci_rsci_data,
.data = &of_rsci_rzt2h_data,
},
#endif /* CONFIG_SERIAL_RSCI */
/* Family-specific types */