2023-07-05 18:38:19

by Dmitry Rokosov

Subject: [PATCH v2 4/7] 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 <[email protected]>
---
drivers/tty/serial/meson_uart.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
index ad0748a10db7..6a63184b8091 100644
--- 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 */ },
};
--
2.36.0

2023-07-06 07:43:41

by Neil Armstrong

Subject: Re: [PATCH v2 4/7] tty: serial: meson: introduce separate uart_data for S4 SoC family

On 05/07/2023 20:18, Dmitry Rokosov wrote:
> 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 <[email protected]>
> ---
> drivers/tty/serial/meson_uart.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
> index ad0748a10db7..6a63184b8091 100644
> --- 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 */ },
> };

With the real struct name:

Reviewed-by: Neil Armstrong <[email protected]>