diff options
author | Kevin Hilman <khilman@baylibre.com> | 2016-04-27 19:12:28 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@baylibre.com> | 2016-06-01 13:57:19 -0400 |
commit | 8e6320dd4aaec53baf2f7e90aac80e520cd45f08 (patch) | |
tree | 633e7feebc88619134b947b69d461db2b9ed0055 | |
parent | a8025ed6965dc8697ddaea0284e84e3082809940 (diff) |
ARM64: dts: amlogic: gxbb: pinctrl: add/update UART
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>
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 42 |
2 files changed, 42 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 41e1e669bc70..45778896bd3d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | |||
@@ -80,3 +80,4 @@ | |||
80 | pinctrl-0 = <&uart_ao_a_pins>; | 80 | pinctrl-0 = <&uart_ao_a_pins>; |
81 | pinctrl-names = "default"; | 81 | pinctrl-names = "default"; |
82 | }; | 82 | }; |
83 | |||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index e01f3b505f36..075a8f877bc7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | |||
@@ -132,11 +132,27 @@ | |||
132 | 132 | ||
133 | uart_A: serial@84c0 { | 133 | uart_A: serial@84c0 { |
134 | compatible = "amlogic,meson-uart"; | 134 | compatible = "amlogic,meson-uart"; |
135 | reg = <0x0 0x084c0 0x0 0x14>; | 135 | reg = <0x0 0x84c0 0x0 0x14>; |
136 | interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>; | 136 | interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>; |
137 | clocks = <&xtal>; | 137 | clocks = <&xtal>; |
138 | status = "disabled"; | 138 | status = "disabled"; |
139 | }; | 139 | }; |
140 | |||
141 | uart_B: serial@84dc { | ||
142 | compatible = "amlogic,meson-uart"; | ||
143 | reg = <0x0 0x84dc 0x0 0x14>; | ||
144 | interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>; | ||
145 | clocks = <&xtal>; | ||
146 | status = "disabled"; | ||
147 | }; | ||
148 | |||
149 | uart_C: serial@8700 { | ||
150 | compatible = "amlogic,meson-uart"; | ||
151 | reg = <0x0 0x8700 0x0 0x14>; | ||
152 | interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>; | ||
153 | clocks = <&xtal>; | ||
154 | status = "disabled"; | ||
155 | }; | ||
140 | }; | 156 | }; |
141 | 157 | ||
142 | gic: interrupt-controller@c4301000 { | 158 | gic: interrupt-controller@c4301000 { |
@@ -234,6 +250,30 @@ | |||
234 | function = "sdcard"; | 250 | function = "sdcard"; |
235 | }; | 251 | }; |
236 | }; | 252 | }; |
253 | |||
254 | uart_a_pins: uart_a { | ||
255 | mux { | ||
256 | groups = "uart_tx_a", | ||
257 | "uart_rx_a"; | ||
258 | function = "uart_a"; | ||
259 | }; | ||
260 | }; | ||
261 | |||
262 | uart_b_pins: uart_b { | ||
263 | mux { | ||
264 | groups = "uart_tx_b", | ||
265 | "uart_rx_b"; | ||
266 | function = "uart_b"; | ||
267 | }; | ||
268 | }; | ||
269 | |||
270 | uart_c_pins: uart_c { | ||
271 | mux { | ||
272 | groups = "uart_tx_c", | ||
273 | "uart_rx_c"; | ||
274 | function = "uart_c"; | ||
275 | }; | ||
276 | }; | ||
237 | }; | 277 | }; |
238 | }; | 278 | }; |
239 | 279 | ||