]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM64: dts: amlogic: gxbb: pinctrl: add/update UART
authorKevin Hilman <khilman@baylibre.com>
Wed, 27 Apr 2016 23:12:28 +0000 (16:12 -0700)
committerKevin Hilman <khilman@baylibre.com>
Wed, 1 Jun 2016 17:57:19 +0000 (10:57 -0700)
Add DT nodes for additional UARTs (UART B & C in EE domain) and add pins
for all EE domain UARTs.

Acked-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

index 41e1e669bc704f2d72bb64e17fb5c69867230f10..45778896bd3d96758e176b19f594b127398e7bbb 100644 (file)
@@ -80,3 +80,4 @@ &uart_AO {
        pinctrl-0 = <&uart_ao_a_pins>;
        pinctrl-names = "default";
 };
+
index e01f3b505f36577be1e6f190def85e7b2df492bc..075a8f877bc751596569af83f97ae8f1fc8affcf 100644 (file)
@@ -132,11 +132,27 @@ cbus: cbus@c1100000 {
 
                        uart_A: serial@84c0 {
                                compatible = "amlogic,meson-uart";
-                               reg = <0x0 0x084c0 0x0 0x14>;
+                               reg = <0x0 0x84c0 0x0 0x14>;
                                interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
                                clocks = <&xtal>;
                                status = "disabled";
                        };
+
+                       uart_B: serial@84dc {
+                               compatible = "amlogic,meson-uart";
+                               reg = <0x0 0x84dc 0x0 0x14>;
+                               interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
+                               clocks = <&xtal>;
+                               status = "disabled";
+                       };
+
+                       uart_C: serial@8700 {
+                               compatible = "amlogic,meson-uart";
+                               reg = <0x0 0x8700 0x0 0x14>;
+                               interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
+                               clocks = <&xtal>;
+                               status = "disabled";
+                       };
                };
 
                gic: interrupt-controller@c4301000 {
@@ -234,6 +250,30 @@ mux {
                                                function = "sdcard";
                                        };
                                };
+
+                               uart_a_pins: uart_a {
+                                       mux {
+                                               groups = "uart_tx_a",
+                                                      "uart_rx_a";
+                                               function = "uart_a";
+                                       };
+                               };
+
+                               uart_b_pins: uart_b {
+                                       mux {
+                                               groups = "uart_tx_b",
+                                                      "uart_rx_b";
+                                               function = "uart_b";
+                                       };
+                               };
+
+                               uart_c_pins: uart_c {
+                                       mux {
+                                               groups = "uart_tx_c",
+                                                      "uart_rx_c";
+                                               function = "uart_c";
+                                       };
+                               };
                        };
                };