| Message ID | 20230307222651.2106615-3-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | meson-uart: Use "divide XTAL by 2" bit on G12A | expand |
On 07/03/2023 23:26, Martin Blumenstingl wrote: > Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit > as the S4 UART controllers. Add a new compatible string for these SoCs > and enable the has_xtal_div2 flag for them. > > Tested-by: Christian Hewitt <christianshewitt@gmail.com> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > Changes from v1 -> v2: > - none > > Changes from v2 -> v3: > - none > > > drivers/tty/serial/meson_uart.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index 74110017988a..2501db5a7aaf 100644 > --- a/drivers/tty/serial/meson_uart.c > +++ b/drivers/tty/serial/meson_uart.c > @@ -779,7 +779,7 @@ static int meson_uart_remove(struct platform_device *pdev) > return 0; > } > > -static struct meson_uart_data s4_uart_data = { > +static struct meson_uart_data meson_g12a_uart_data = { > .has_xtal_div2 = true, > }; > > @@ -788,9 +788,13 @@ static const struct of_device_id meson_uart_dt_match[] = { > { .compatible = "amlogic,meson8-uart" }, > { .compatible = "amlogic,meson8b-uart" }, > { .compatible = "amlogic,meson-gx-uart" }, > + { > + .compatible = "amlogic,meson-g12a-uart", > + .data = (void *)&meson_g12a_uart_data, > + }, > { > .compatible = "amlogic,meson-s4-uart", > - .data = (void *)&s4_uart_data, > + .data = (void *)&meson_g12a_uart_data, > }, > { /* sentinel */ }, > }; 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 74110017988a..2501db5a7aaf 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -779,7 +779,7 @@ static int meson_uart_remove(struct platform_device *pdev) return 0; } -static struct meson_uart_data s4_uart_data = { +static struct meson_uart_data meson_g12a_uart_data = { .has_xtal_div2 = true, }; @@ -788,9 +788,13 @@ static const struct of_device_id meson_uart_dt_match[] = { { .compatible = "amlogic,meson8-uart" }, { .compatible = "amlogic,meson8b-uart" }, { .compatible = "amlogic,meson-gx-uart" }, + { + .compatible = "amlogic,meson-g12a-uart", + .data = (void *)&meson_g12a_uart_data, + }, { .compatible = "amlogic,meson-s4-uart", - .data = (void *)&s4_uart_data, + .data = (void *)&meson_g12a_uart_data, }, { /* sentinel */ }, };