116 lines
4.0 KiB
Diff
116 lines
4.0 KiB
Diff
diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
|
|
index 3cbdde85ed71..22656efe8ddc 100644
|
|
--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
|
|
+++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
|
|
@@ -34,6 +34,11 @@ properties:
|
|
- amlogic,meson-gx-uart
|
|
- amlogic,meson-s4-uart
|
|
- const: amlogic,meson-ao-uart
|
|
+ - description: Always-on power domain UART controller on G12A SoCs
|
|
+ items:
|
|
+ - const: amlogic,meson-g12a-uart
|
|
+ - const: amlogic,meson-gx-uart
|
|
+ - const: amlogic,meson-ao-uart
|
|
- description: Everything-Else power domain UART controller
|
|
enum:
|
|
- amlogic,meson6-uart
|
|
@@ -41,6 +46,10 @@ properties:
|
|
- amlogic,meson8b-uart
|
|
- amlogic,meson-gx-uart
|
|
- amlogic,meson-s4-uart
|
|
+ - description: Everything-Else power domain UART controller on G12A SoCs
|
|
+ items:
|
|
+ - const: amlogic,meson-g12a-uart
|
|
+ - const: amlogic,meson-gx-uart
|
|
|
|
reg:
|
|
maxItems: 1
|
|
--
|
|
2.39.2
|
|
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 */ },
|
|
};
|
|
--
|
|
2.39.2
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
|
index 123a56f7f818..904bcd4d2acf 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
|
@@ -2046,7 +2046,8 @@ pwm_AO_cd: pwm@2000 {
|
|
};
|
|
|
|
uart_AO: serial@3000 {
|
|
- compatible = "amlogic,meson-gx-uart",
|
|
+ compatible = "amlogic,meson-g12a-uart",
|
|
+ "amlogic,meson-gx-uart",
|
|
"amlogic,meson-ao-uart";
|
|
reg = <0x0 0x3000 0x0 0x18>;
|
|
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
|
|
@@ -2056,7 +2057,8 @@ uart_AO: serial@3000 {
|
|
};
|
|
|
|
uart_AO_B: serial@4000 {
|
|
- compatible = "amlogic,meson-gx-uart",
|
|
+ compatible = "amlogic,meson-g12a-uart",
|
|
+ "amlogic,meson-gx-uart",
|
|
"amlogic,meson-ao-uart";
|
|
reg = <0x0 0x4000 0x0 0x18>;
|
|
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
|
|
@@ -2293,7 +2295,8 @@ clk_msr: clock-measure@18000 {
|
|
};
|
|
|
|
uart_C: serial@22000 {
|
|
- compatible = "amlogic,meson-gx-uart";
|
|
+ compatible = "amlogic,meson-g12a-uart",
|
|
+ "amlogic,meson-gx-uart";
|
|
reg = <0x0 0x22000 0x0 0x18>;
|
|
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
|
|
@@ -2302,7 +2305,8 @@ uart_C: serial@22000 {
|
|
};
|
|
|
|
uart_B: serial@23000 {
|
|
- compatible = "amlogic,meson-gx-uart";
|
|
+ compatible = "amlogic,meson-g12a-uart",
|
|
+ "amlogic,meson-gx-uart";
|
|
reg = <0x0 0x23000 0x0 0x18>;
|
|
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
|
|
@@ -2311,7 +2315,8 @@ uart_B: serial@23000 {
|
|
};
|
|
|
|
uart_A: serial@24000 {
|
|
- compatible = "amlogic,meson-gx-uart";
|
|
+ compatible = "amlogic,meson-g12a-uart",
|
|
+ "amlogic,meson-gx-uart";
|
|
reg = <0x0 0x24000 0x0 0x18>;
|
|
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
|
clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
|
|
--
|
|
2.39.2
|