pinctrl: mvebu: a38x: Add UART1 muxing options
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Fri, 5 Dec 2014 14:44:57 +0000 (15:44 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Sat, 10 Jan 2015 21:47:23 +0000 (22:47 +0100)
The MPP19 and MMP20 pins also have the ability to be muxed to the uart1
function.

Add this case to the pinctrl driver.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/mvebu/pinctrl-armada-38x.c

index 224c6cf..7302f66 100644 (file)
@@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(2, "ptp",   "event_req",  V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(3, "pcie0", "clkreq",     V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "sata1", "prsnt",      V_88F6810_PLUS),
-                MPP_VAR_FUNCTION(5, "ua0",   "cts",        V_88F6810_PLUS)),
+                MPP_VAR_FUNCTION(5, "ua0",   "cts",        V_88F6810_PLUS),
+                MPP_VAR_FUNCTION(6, "ua1",   "rxd",        V_88F6810_PLUS)),
        MPP_MODE(20,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "ge0",   "txclk",      V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(2, "ptp",   "clk",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(3, "pcie1", "rstout",     V_88F6820_PLUS),
                 MPP_VAR_FUNCTION(4, "sata0", "prsnt",      V_88F6810_PLUS),
-                MPP_VAR_FUNCTION(5, "ua0",   "rts",        V_88F6810_PLUS)),
+                MPP_VAR_FUNCTION(5, "ua0",   "rts",        V_88F6810_PLUS),
+                MPP_VAR_FUNCTION(6, "ua1",   "txd",        V_88F6810_PLUS)),
        MPP_MODE(21,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "spi0",  "cs1",        V_88F6810_PLUS),