tty: serial: meson: introduce separate uart_data for S4 SoC family

In order to use the correct devname value for the S4 SoC family, it
is imperative that we implement separate uart_data. Unlike the legacy
g12a architecture, the S4 architecture should employ the use of 'ttyS'
devname.

Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230705181833.16137-5-ddrokosov@sberdevices.ru
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index ad0748a10db76b6fc8d9a5022ac516a7b41bac9d..6a63184b8091d240bf15559bdf12abce61398713 100644 (file)
--- a/drivers/tty/serial/meson_uart.c
+++ b/drivers/tty/serial/meson_uart.c
@@ -818,6 +818,11 @@ static struct meson_uart_data meson_g12a_uart_data = {
        .has_xtal_div2 = true,
 };
 
+static struct meson_uart_data meson_s4_uart_data = {
+       .uart_driver = &MESON_UART_DRIVER(ttyS),
+       .has_xtal_div2 = true,
+};
+
 static const struct of_device_id meson_uart_dt_match[] = {
        { .compatible = "amlogic,meson6-uart" },
        { .compatible = "amlogic,meson8-uart" },
@@ -829,7 +834,7 @@ static const struct of_device_id meson_uart_dt_match[] = {
        },
        {
                .compatible = "amlogic,meson-s4-uart",
-               .data = (void *)&meson_g12a_uart_data,
+               .data = (void *)&meson_s4_uart_data,
        },
        { /* sentinel */ },
 };