pinctrl: mvebu: armada-38x: add nand functions

The latest version of the Armada 38x datasheet documents several new
NAND related functions on various MPP pins. This commit adds the
description of these new functions to the Armada 38x pinctrl driver as
well as to its DT binding documentation.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
index 066e26a42994f713bd45e6a3a916ebbd831c35b3..278887d204b5b6db4edda1488315215627433f46 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
@@ -56,9 +56,9 @@ mpp37         37       gpio, ptp(clk), ge1(rxclk), sd0(d3), dev(ad8)
 mpp38         38       gpio, ptp(evreq), ge1(rxd1), ref(clk_out0), sd0(d0), dev(ad4)
 mpp39         39       gpio, i2c1(sck), ge1(rxd2), ua0(cts), sd0(d1), dev(a2)
 mpp40         40       gpio, i2c1(sda), ge1(rxd3), ua0(rts), sd0(d2), dev(ad6)
-mpp41         41       gpio, ua1(rxd), ge1(rxctl), ua0(cts), spi1(cs3), dev(burst/last)
+mpp41         41       gpio, ua1(rxd), ge1(rxctl), ua0(cts), spi1(cs3), dev(burst/last), nand(rb0)
 mpp42         42       gpio, ua1(txd), ua0(rts), dev(ad7)
-mpp43         43       gpio, pcie0(clkreq), dram(vttctrl), dram(deccerr), spi1(cs2), dev(clkout)
+mpp43         43       gpio, pcie0(clkreq), dram(vttctrl), dram(deccerr), spi1(cs2), dev(clkout), nand(rb1)
 mpp44         44       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [3]
 mpp45         45       gpio, ref(clk_out0), pcie0(rstout)
 mpp46         46       gpio, ref(clk_out1), pcie0(rstout)

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
index 8b401b5ad13fa318313ff1072e30ef45f9b730a6..ac8f2973374b742f6369832a0ae86a5cfef7d0f6 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
@@ -268,7 +268,8 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(2, "ge1",   "rxctl",      V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(3, "ua0",   "cts",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "spi1",  "cs3",        V_88F6810_PLUS),
-                MPP_VAR_FUNCTION(5, "dev",   "burst/last", V_88F6810_PLUS)),
+                MPP_VAR_FUNCTION(5, "dev",   "burst/last", V_88F6810_PLUS),
+                MPP_VAR_FUNCTION(6, "nand",  "rb0",        V_88F6810_PLUS)),
        MPP_MODE(42,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "ua1",   "txd",        V_88F6810_PLUS),
@@ -280,7 +281,8 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(2, "dram",  "vttctrl",    V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(3, "dram",  "deccerr",    V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "spi1",  "cs2",        V_88F6810_PLUS),
-                MPP_VAR_FUNCTION(5, "dev",   "clkout",     V_88F6810_PLUS)),
+                MPP_VAR_FUNCTION(5, "dev",   "clkout",     V_88F6810_PLUS),
+                MPP_VAR_FUNCTION(6, "nand",  "rb1",        V_88F6810_PLUS)),
        MPP_MODE(44,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "sata0", "prsnt",      V_88F6810_PLUS),