mvebu: refresh 3.18 patches
[openwrt/svn-archive/archive.git] / target / linux / mvebu / patches-3.18 / 023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch
1 From a95308d88c07e0093aedae7e64f92cb1e165f592 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
3 Date: Fri, 5 Dec 2014 15:44:57 +0100
4 Subject: [PATCH] pinctrl: mvebu: a38x: Add UART1 muxing options
5
6 The MPP19 and MMP20 pins also have the ability to be muxed to the uart1
7 function.
8
9 Add this case to the pinctrl driver.
10
11 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
12 Acked-by: Jason Cooper <jason@lakedaemon.net>
13 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
14 ---
15 drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 ++++--
16 1 file changed, 4 insertions(+), 2 deletions(-)
17
18 --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
19 +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
20 @@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_
21 MPP_VAR_FUNCTION(2, "ptp", "event_req", V_88F6810_PLUS),
22 MPP_VAR_FUNCTION(3, "pcie0", "clkreq", V_88F6810_PLUS),
23 MPP_VAR_FUNCTION(4, "sata1", "prsnt", V_88F6810_PLUS),
24 - MPP_VAR_FUNCTION(5, "ua0", "cts", V_88F6810_PLUS)),
25 + MPP_VAR_FUNCTION(5, "ua0", "cts", V_88F6810_PLUS),
26 + MPP_VAR_FUNCTION(6, "ua1", "rxd", V_88F6810_PLUS)),
27 MPP_MODE(20,
28 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
29 MPP_VAR_FUNCTION(1, "ge0", "txclk", V_88F6810_PLUS),
30 MPP_VAR_FUNCTION(2, "ptp", "clk", V_88F6810_PLUS),
31 MPP_VAR_FUNCTION(3, "pcie1", "rstout", V_88F6820_PLUS),
32 MPP_VAR_FUNCTION(4, "sata0", "prsnt", V_88F6810_PLUS),
33 - MPP_VAR_FUNCTION(5, "ua0", "rts", V_88F6810_PLUS)),
34 + MPP_VAR_FUNCTION(5, "ua0", "rts", V_88F6810_PLUS),
35 + MPP_VAR_FUNCTION(6, "ua1", "txd", V_88F6810_PLUS)),
36 MPP_MODE(21,
37 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
38 MPP_VAR_FUNCTION(1, "spi0", "cs1", V_88F6810_PLUS),