summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2023-03-07 23:26:50 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-09 17:21:02 +0100
commit804e6d6998f7528d23e9cb16f9dbb357bfab5f77 (patch)
tree02c88a46f8a995c3ca494682237e7d00a8201f05
parentadd5dfe87abe962cf9884193d9467f23d898fb8b (diff)
downloadlinux-stable-804e6d6998f7528d23e9cb16f9dbb357bfab5f77.tar.gz
linux-stable-804e6d6998f7528d23e9cb16f9dbb357bfab5f77.tar.bz2
linux-stable-804e6d6998f7528d23e9cb16f9dbb357bfab5f77.zip
tty: serial: meson: Add a new compatible string for the G12A SoC
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> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20230307222651.2106615-3-martin.blumenstingl@googlemail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/meson_uart.c8
1 files 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,
};
@@ -789,8 +789,12 @@ static const struct of_device_id meson_uart_dt_match[] = {
{ .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 */ },
};