diff options
author | Arnaud Ebalard <arno@natisbad.org> | 2014-11-21 18:46:28 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-21 23:35:40 -0500 |
commit | d352f41e87e7226692d1346bb97c603615eeb817 (patch) | |
tree | 4f80f7e9fbdde7677b0b08b2a5fcdc1746099e28 | |
parent | f8afeaea9611b5183b7919de4fb9333dedc72896 (diff) |
arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings
This patch defines common Armada XP pinctrl settings for uart2 and
uart3 interfaces (uart0 and uart1 rx/tx do not rely on MPP):
uart2: MPP42-43 as default
uart3: MPP44-45 as default
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Link: https://lkml.kernel.org/r/fd51c080c7139a67ec01df8d797f1e88ce557796.1416613429.git.arno@natisbad.org
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index b59a83cf2f26..7cefb9b6d27c 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -55,6 +55,8 @@ | |||
55 | 55 | ||
56 | uart2: serial@12200 { | 56 | uart2: serial@12200 { |
57 | compatible = "snps,dw-apb-uart"; | 57 | compatible = "snps,dw-apb-uart"; |
58 | pinctrl-0 = <&uart2_pins>; | ||
59 | pinctrl-names = "default"; | ||
58 | reg = <0x12200 0x100>; | 60 | reg = <0x12200 0x100>; |
59 | reg-shift = <2>; | 61 | reg-shift = <2>; |
60 | interrupts = <43>; | 62 | interrupts = <43>; |
@@ -65,6 +67,8 @@ | |||
65 | 67 | ||
66 | uart3: serial@12300 { | 68 | uart3: serial@12300 { |
67 | compatible = "snps,dw-apb-uart"; | 69 | compatible = "snps,dw-apb-uart"; |
70 | pinctrl-0 = <&uart3_pins>; | ||
71 | pinctrl-names = "default"; | ||
68 | reg = <0x12300 0x100>; | 72 | reg = <0x12300 0x100>; |
69 | reg-shift = <2>; | 73 | reg-shift = <2>; |
70 | interrupts = <44>; | 74 | interrupts = <44>; |
@@ -235,4 +239,14 @@ | |||
235 | "mpp33", "mpp34", "mpp35"; | 239 | "mpp33", "mpp34", "mpp35"; |
236 | marvell,function = "sd0"; | 240 | marvell,function = "sd0"; |
237 | }; | 241 | }; |
242 | |||
243 | uart2_pins: uart2-pins { | ||
244 | marvell,pins = "mpp42", "mpp43"; | ||
245 | marvell,function = "uart2"; | ||
246 | }; | ||
247 | |||
248 | uart3_pins: uart3-pins { | ||
249 | marvell,pins = "mpp44", "mpp45"; | ||
250 | marvell,function = "uart3"; | ||
251 | }; | ||
238 | }; | 252 | }; |