CC: kernel: update 3.18 to 3.18.18
[15.05/openwrt.git] / target / linux / mvebu / patches-3.18 / 016-common_armada_xp_uart2_3_pinctrl.patch
1 From d352f41e87e7226692d1346bb97c603615eeb817 Mon Sep 17 00:00:00 2001
2 From: Arnaud Ebalard <arno@natisbad.org>
3 Date: Sat, 22 Nov 2014 00:46:28 +0100
4 Subject: arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings
5
6 This patch defines common Armada XP pinctrl settings for uart2 and
7 uart3 interfaces (uart0 and uart1 rx/tx do not rely on MPP):
8
9  uart2: MPP42-43 as default
10  uart3: MPP44-45 as default
11
12 Suggested-by: Andrew Lunn <andrew@lunn.ch>
13 Acked-by: Andrew Lunn <andrew@lunn.ch>
14 Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
15 Link: https://lkml.kernel.org/r/fd51c080c7139a67ec01df8d797f1e88ce557796.1416613429.git.arno@natisbad.org
16 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
17
18 --- a/arch/arm/boot/dts/armada-xp.dtsi
19 +++ b/arch/arm/boot/dts/armada-xp.dtsi
20 @@ -55,6 +55,8 @@
21  
22                         uart2: serial@12200 {
23                                 compatible = "snps,dw-apb-uart";
24 +                               pinctrl-0 = <&uart2_pins>;
25 +                               pinctrl-names = "default";
26                                 reg = <0x12200 0x100>;
27                                 reg-shift = <2>;
28                                 interrupts = <43>;
29 @@ -65,6 +67,8 @@
30  
31                         uart3: serial@12300 {
32                                 compatible = "snps,dw-apb-uart";
33 +                               pinctrl-0 = <&uart3_pins>;
34 +                               pinctrl-names = "default";
35                                 reg = <0x12300 0x100>;
36                                 reg-shift = <2>;
37                                 interrupts = <44>;
38 @@ -243,4 +247,14 @@
39                                "mpp33", "mpp34", "mpp35";
40                 marvell,function = "sd0";
41         };
42 +
43 +       uart2_pins: uart2-pins {
44 +               marvell,pins = "mpp42", "mpp43";
45 +               marvell,function = "uart2";
46 +       };
47 +
48 +       uart3_pins: uart3-pins {
49 +               marvell,pins = "mpp44", "mpp45";
50 +               marvell,function = "uart3";
51 +       };
52  };