summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2017-01-15 17:20:29 -0500
committerKevin Hilman <khilman@baylibre.com>2017-01-18 17:34:50 -0500
commit890a96a257b497e8361055ffbf66e2fd08833074 (patch)
treeb66f7b587fffa82523e62de9a183af63a36a5877 /arch/arm64
parent5a582cff47c90af29ecb293caa2f667bd4d45e54 (diff)
ARM64: dts: meson-gx: add the missing uart_AO_B
This adds the missing node for the uart_AO_B port to the meson-gx.dtsi (as this is supported by GXBB, GXL and GXM) along with the required pinctrl pins. This is required as some boards are using it (the boards from the Khadas VIM series for example have it exposed on the pin headers). Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-gx.dtsi8
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi7
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-gxl.dtsi7
3 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index be56b9fae2aa..9212fca6eb94 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -324,6 +324,14 @@
324 status = "disabled"; 324 status = "disabled";
325 }; 325 };
326 326
327 uart_AO_B: serial@4e0 {
328 compatible = "amlogic,meson-uart";
329 reg = <0x0 0x004e0 0x0 0x14>;
330 interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
331 clocks = <&xtal>;
332 status = "disabled";
333 };
334
327 ir: ir@580 { 335 ir: ir@580 {
328 compatible = "amlogic,meson-gxbb-ir"; 336 compatible = "amlogic,meson-gxbb-ir";
329 reg = <0x0 0x00580 0x0 0x40>; 337 reg = <0x0 0x00580 0x0 0x40>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 5d686334f692..474435e21759 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -138,6 +138,13 @@
138 }; 138 };
139 }; 139 };
140 140
141 uart_ao_b_pins: uart_ao_b {
142 mux {
143 groups = "uart_tx_ao_b", "uart_rx_ao_b";
144 function = "uart_ao_b";
145 };
146 };
147
141 remote_input_ao_pins: remote_input_ao { 148 remote_input_ao_pins: remote_input_ao {
142 mux { 149 mux {
143 groups = "remote_input_ao"; 150 groups = "remote_input_ao";
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 69216246275d..6d815f9930c9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -88,6 +88,13 @@
88 }; 88 };
89 }; 89 };
90 90
91 uart_ao_b_pins: uart_ao_b {
92 mux {
93 groups = "uart_tx_ao_b", "uart_rx_ao_b";
94 function = "uart_ao_b";
95 };
96 };
97
91 remote_input_ao_pins: remote_input_ao { 98 remote_input_ao_pins: remote_input_ao {
92 mux { 99 mux {
93 groups = "remote_input_ao"; 100 groups = "remote_input_ao";