pinctrl: mvebu: armada-39x: add missing PCIe functions

The latest version of the Armada 39x datasheet documents several new
PCIe related functions on various MPP pins. This commit adds the
description of these new functions to the Armada 39x 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-39x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
index 1dd76e953725f9628820563207376e210f3c416f..2e4725fbef7311cdb2af471901d9bd2dfec3a3a1 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
@@ -27,10 +27,10 @@ mpp9        9       gpio, dev(ad11), ptp(clk)
 mpp10  10      gpio, dev(ad12), ptp(evreq)
 mpp11  11      gpio, dev(ad13), led(clk)
 mpp12  12      gpio, pcie0(rstout), dev(ad14), led(stb)
-mpp13  13      gpio, dev(ad15), led(data)
+mpp13  13      gpio, dev(ad15), pcie2(clkreq), led(data)
 mpp14  14      gpio, dram(vttctrl), dev(we1), ua1(txd)
 mpp15  15      gpio, pcie0(rstout), spi0(mosi), i2c1(sck)
-mpp16  16      gpio, dram(deccerr), spi0(miso), i2c1(sda)
+mpp16  16      gpio, dram(deccerr), spi0(miso), pcie0(clkreq), i2c1(sda)
 mpp17  17      gpio, ua1(rxd), spi0(sck), smi(mdio)
 mpp18  18      gpio, ua1(txd), spi0(cs0), i2c2(sck)
 mpp19  19      gpio, sata1(prsnt) [1], ua0(cts), ua1(rxd), i2c2(sda)

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
index 08ee427d501501ca127f0722deadd41a11ffd480..afab0c1a886a6e404ad8eb2e232b85e5117270c1 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
@@ -95,6 +95,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
        MPP_MODE(13,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(5, "dev",     "ad15",     V_88F6920_PLUS),
+                MPP_VAR_FUNCTION(6, "pcie2",   "clkreq",   V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(7, "led",     "data",     V_88F6920_PLUS)),
        MPP_MODE(14,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
@@ -110,6 +111,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(3, "dram",    "deccerr",  V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(4, "spi0",    "miso",     V_88F6920_PLUS),
+                MPP_VAR_FUNCTION(5, "pcie0",   "clkreq",   V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(7, "i2c1",    "sda",      V_88F6920_PLUS)),
        MPP_MODE(17,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),