| Message ID | 20230705181833.16137-6-ddrokosov@sberdevices.ru |
|---|---|
| State | New |
| Headers | show |
| Series | tty: serial: meson: support ttyS devname | expand |
On 05/07/2023 20:18, Dmitry Rokosov wrote: > Implement separate uart_data to ensure proper devname value for the A1 > SoC family. Use 'ttyS' devname, as required by the A1 architecture, > instead of the legacy gx architecture. > > Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru> > --- > drivers/tty/serial/meson_uart.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index 6a63184b8091..84cf10b0ca5c 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_a1_uart_data = { > + .uart_driver = &MESON_UART_DRIVER(ttyS), > + .has_xtal_div2 = false, > +}; > + > static struct meson_uart_data meson_s4_uart_data = { > .uart_driver = &MESON_UART_DRIVER(ttyS), > .has_xtal_div2 = true, > @@ -836,6 +841,10 @@ static const struct of_device_id meson_uart_dt_match[] = { > .compatible = "amlogic,meson-s4-uart", > .data = (void *)&meson_s4_uart_data, > }, > + { > + .compatible = "amlogic,meson-a1-uart", > + .data = (void *)&meson_a1_uart_data, > + }, > { /* sentinel */ }, > }; > MODULE_DEVICE_TABLE(of, meson_uart_dt_match); With the real struct name: Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index 6a63184b8091..84cf10b0ca5c 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_a1_uart_data = { + .uart_driver = &MESON_UART_DRIVER(ttyS), + .has_xtal_div2 = false, +}; + static struct meson_uart_data meson_s4_uart_data = { .uart_driver = &MESON_UART_DRIVER(ttyS), .has_xtal_div2 = true, @@ -836,6 +841,10 @@ static const struct of_device_id meson_uart_dt_match[] = { .compatible = "amlogic,meson-s4-uart", .data = (void *)&meson_s4_uart_data, }, + { + .compatible = "amlogic,meson-a1-uart", + .data = (void *)&meson_a1_uart_data, + }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, meson_uart_dt_match);
Implement separate uart_data to ensure proper devname value for the A1 SoC family. Use 'ttyS' devname, as required by the A1 architecture, instead of the legacy gx architecture. Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru> --- drivers/tty/serial/meson_uart.c | 9 +++++++++ 1 file changed, 9 insertions(+)