pinctrl: mvebu: armada-{370,375,38x,39x,xp}: normalize TDM pins

This commit normalizes the naming of the TDM pins accross the different Marvell SoCs. Mainly it consists in: * Removing the 'n' from signal names: 'intn' becomes 'int' and 'rstn' becomes 'rst' * Renaming the main name 'tdm2c' to 'tdm' on Armada 38x. * Change the main name 'tdm-1' to 'tdm' for one of the pins of the Armada XP The last two changes affect DT compatibility, but since the TDM interface is nowhere near being supported in mainline, it should not be considered to be a serious problem at this point. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2015-06-09 12:47:08 -0400
committer: Linus Walleij <linus.walleij@linaro.org> 2015-06-10 07:35:33 -0400
commit: dae5597f253ae2d44432c8648d9a9205de057ddf (patch)
tree: ac9840c5a241616e0c93458c13199330d95365f7
parent: 5cc0de1faff6ac801286dfab88e4a31392cbb3f0 (diff)
10 files changed, 26 insertions, 26 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
index 183c4723d9c8..e6dce5d7ef8d 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
@@ -20,7 +20,7 @@ mpp3          3        gpio, i2c0(sda), uart0(rxd)
 mpp4          4        gpio, cpu_pd(vdd)
 mpp5          5        gpo, ge0(txclko), uart1(txd), spi1(clk), audio(mclk)
 mpp6          6        gpio, ge0(txd0), sata0(prsnt), tdm(rst), audio(sdo)
-mpp7          7        gpo, ge0(txd1), tdm(tdx), audio(lrclk)
+mpp7          7        gpo, ge0(txd1), tdm(dtx), audio(lrclk)
 mpp8          8        gpio, ge0(txd2), uart0(rts), tdm(drx), audio(bclk)
 mpp9          9        gpo, ge0(txd3), uart1(txd), sd0(clk), audio(spdifo)
 mpp10         10       gpio, ge0(txctl), uart0(cts), tdm(fsync), audio(sdi)
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
index ce1771bd9106..314032481ccf 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
@@ -31,8 +31,8 @@ mpp14        14        gpio, i2c0(sda), uart1(txd)
 mpp15        15        gpio, i2c0(sck), uart1(rxd)
 mpp16        16        gpio, uart0(txd)
 mpp17        17        gpio, uart0(rxd)
-mpp18        18        gpio, tdm(intn)
+mpp18        18        gpio, tdm(int)
-mpp19        19        gpio, tdm(rstn)
+mpp19        19        gpio, tdm(rst)
 mpp20        20        gpio, tdm(pclk)
 mpp21        21        gpio, tdm(fsync)
 mpp22        22        gpio, tdm(drx)
@@ -50,7 +50,7 @@ mpp33        33        gpio, ge1(txd3), spi1(miso)
 mpp34        34        gpio, ge1(txclkout), spi1(sck)
 mpp35        35        gpio, ge1(rxctl), spi1(cs1), spi0(cs2)
 mpp36        36        gpio, pcie0(clkreq)
-mpp37        37        gpio, pcie0(clkreq), tdm(intn), ge(mdc)
+mpp37        37        gpio, pcie0(clkreq), tdm(int), ge(mdc)
 mpp38        38        gpio, pcie1(clkreq), ge(mdio)
 mpp39        39        gpio, ref(clkout)
 mpp40        40        gpio, uart1(txd)
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
index 9844773032c5..203220d2392f 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
@@ -63,12 +63,12 @@ mpp44         44       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3
 mpp45         45       gpio, ref(clk_out0), pcie0(rstout)
 mpp46         46       gpio, ref(clk_out1), pcie0(rstout)
 mpp47         47       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [2]
-mpp48         48       gpio, sata0(prsnt), dram(vttctrl), tdm2c(pclk), audio(mclk), sd0(d4), pcie0(clkreq)
+mpp48         48       gpio, sata0(prsnt), dram(vttctrl), tdm(pclk), audio(mclk), sd0(d4), pcie0(clkreq)
-mpp49         49       gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm2c(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)
+mpp49         49       gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)
-mpp50         50       gpio, pcie0(rstout), tdm2c(drx), audio(extclk), sd0(cmd)
+mpp50         50       gpio, pcie0(rstout), tdm(drx), audio(extclk), sd0(cmd)
-mpp51         51       gpio, tdm2c(dtx), audio(sdo), dram(deccerr)
+mpp51         51       gpio, tdm(dtx), audio(sdo), dram(deccerr)
-mpp52         52       gpio, pcie0(rstout), tdm2c(intn), audio(sdi), sd0(d6)
+mpp52         52       gpio, pcie0(rstout), tdm(int), audio(sdi), sd0(d6)
-mpp53         53       gpio, sata1(prsnt), sata0(prsnt), tdm2c(rstn), audio(bclk), sd0(d7)
+mpp53         53       gpio, sata1(prsnt), sata0(prsnt), tdm(rst), audio(bclk), sd0(d7)
 mpp54         54       gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3)
 mpp55         55       gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0)
 mpp56         56       gpio, ua1(rts), ge(mdc), dram(deccerr), spi1(mosi)
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
index b6bd9cc09af8..1dd76e953725 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
@@ -66,8 +66,8 @@ mpp48	48	gpio, sata0(prsnt) [1], dram(vttctrl), tdm(pclk) [1], audio(mclk) [1],
 mpp49   49      gpio, tdm(fsync) [1], audio(lrclk) [1], sd0(d5), ua2(rxd)
 mpp50   50      gpio, pcie0(rstout), tdm(drx) [1], audio(extclk) [1], sd0(cmd), ua2(rxd)
 mpp51   51      gpio, tdm(dtx) [1], audio(sdo) [1], dram(deccerr), ua2(txd)
-mpp52   52      gpio, pcie0(rstout), tdm(intn) [1], audio(sdi) [1], sd0(d6), i2c3(sck)
+mpp52   52      gpio, pcie0(rstout), tdm(int) [1], audio(sdi) [1], sd0(d6), i2c3(sck)
-mpp53   53      gpio, sata1(prsnt) [1], sata0(prsnt) [1], tdm(rstn) [1], audio(bclk) [1], sd0(d7), i2c3(sda)
+mpp53   53      gpio, sata1(prsnt) [1], sata0(prsnt) [1], tdm(rst) [1], audio(bclk) [1], sd0(d7), i2c3(sda)
 mpp54   54      gpio, sata0(prsnt) [1], sata1(prsnt) [1], pcie0(rstout), sd0(d3), ua3(txd)
 mpp55   55      gpio, ua1(cts), spi1(cs1), sd0(d0), ua1(rxd), ua3(rxd)
 mpp56   56      gpio, ua1(rts), dram(deccerr), spi1(mosi), ua1(txd)
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
index cefca173366e..561e5190f5ac 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
@@ -61,7 +61,7 @@ mpp39         39       gpio, spi(cs0)
 mpp40         40       gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)
 mpp41         41       gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),
                       pcie(clkreq1)
-mpp42         42       gpio, uart2(rxd), uart0(cts), tdm(int7), tdm-1(timer)
+mpp42         42       gpio, uart2(rxd), uart0(cts), tdm(int7), tdm(timer)
 mpp43         43       gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout)
 mpp44         44       gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),
                       dram(bat)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index 7d2be71f0237..fe5cfd11ed66 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -68,7 +68,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
        MPP_MODE(7,
           MPP_FUNCTION(0x0, "gpo", NULL),
           MPP_FUNCTION(0x1, "ge0", "txd1"),
-           MPP_FUNCTION(0x4, "tdm", "tdx"),
+           MPP_FUNCTION(0x4, "tdm", "dtx"),
           MPP_FUNCTION(0x5, "audio", "lrclk")),
        MPP_MODE(8,
           MPP_FUNCTION(0x0, "gpio", NULL),
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-375.c b/drivers/pinctrl/mvebu/pinctrl-armada-375.c
index 6dfe1bfff575..c41dd19f321a 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-375.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-375.c
@@ -141,10 +141,10 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
                 MPP_FUNCTION(0x2, "uart0", "rxd")),
        MPP_MODE(18,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                 MPP_FUNCTION(0x2, "tdm", "intn")),
+                 MPP_FUNCTION(0x2, "tdm", "int")),
        MPP_MODE(19,
                 MPP_FUNCTION(0x0, "gpio", NULL),
-                 MPP_FUNCTION(0x2, "tdm", "rstn")),
+                 MPP_FUNCTION(0x2, "tdm", "rst")),
        MPP_MODE(20,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x2, "tdm", "pclk")),
@@ -242,7 +242,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
        MPP_MODE(37,
                 MPP_FUNCTION(0x0, "gpio", NULL),
                 MPP_FUNCTION(0x1, "pcie0", "clkreq"),
-                 MPP_FUNCTION(0x2, "tdm", "intn"),
+                 MPP_FUNCTION(0x2, "tdm", "int"),
                 MPP_FUNCTION(0x4, "ge", "mdc")),
        MPP_MODE(38,
                 MPP_FUNCTION(0x0, "gpio", NULL),
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
index 793d0dfec220..b5006f769d59 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
@@ -303,7 +303,7 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "sata0", "prsnt",      V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(2, "dram",  "vttctrl",    V_88F6810_PLUS),
-                 MPP_VAR_FUNCTION(3, "tdm2c", "pclk",       V_88F6810_PLUS),
+                 MPP_VAR_FUNCTION(3, "tdm",   "pclk",       V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "audio", "mclk",       V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(5, "sd0",   "d4",         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(6, "pcie0", "clkreq",     V_88F6810_PLUS)),
@@ -311,32 +311,32 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "sata2", "prsnt",      V_88F6828),
                 MPP_VAR_FUNCTION(2, "sata3", "prsnt",      V_88F6828),
-                 MPP_VAR_FUNCTION(3, "tdm2c", "fsync",      V_88F6810_PLUS),
+                 MPP_VAR_FUNCTION(3, "tdm",   "fsync",      V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "audio", "lrclk",      V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(5, "sd0",   "d5",         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(6, "pcie1", "clkreq",     V_88F6820_PLUS)),
        MPP_MODE(50,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "pcie0", "rstout",     V_88F6810_PLUS),
-                 MPP_VAR_FUNCTION(3, "tdm2c", "drx",        V_88F6810_PLUS),
+                 MPP_VAR_FUNCTION(3, "tdm",   "drx",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "audio", "extclk",     V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(5, "sd0",   "cmd",        V_88F6810_PLUS)),
        MPP_MODE(51,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
-                 MPP_VAR_FUNCTION(3, "tdm2c", "dtx",        V_88F6810_PLUS),
+                 MPP_VAR_FUNCTION(3, "tdm",   "dtx",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "audio", "sdo",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(5, "dram",  "deccerr",    V_88F6810_PLUS)),
        MPP_MODE(52,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "pcie0", "rstout",     V_88F6810_PLUS),
-                 MPP_VAR_FUNCTION(3, "tdm2c", "intn",       V_88F6810_PLUS),
+                 MPP_VAR_FUNCTION(3, "tdm",   "int",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "audio", "sdi",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(5, "sd0",   "d6",         V_88F6810_PLUS)),
        MPP_MODE(53,
                 MPP_VAR_FUNCTION(0, "gpio",  NULL,         V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(1, "sata1", "prsnt",      V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(2, "sata0", "prsnt",      V_88F6810_PLUS),
-                 MPP_VAR_FUNCTION(3, "tdm2c", "rstn",       V_88F6810_PLUS),
+                 MPP_VAR_FUNCTION(3, "tdm",   "rst",        V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(4, "audio", "bclk",       V_88F6810_PLUS),
                 MPP_VAR_FUNCTION(5, "sd0",   "d7",         V_88F6810_PLUS)),
        MPP_MODE(54,
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
index de91b3598653..433291a1540a 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
@@ -308,7 +308,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
        MPP_MODE(52,
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(1, "pcie0",   "rstout",   V_88F6920_PLUS),
-                 MPP_VAR_FUNCTION(3, "tdm",     "intn",     V_88F6928),
+                 MPP_VAR_FUNCTION(3, "tdm",     "int",      V_88F6928),
                 MPP_VAR_FUNCTION(4, "audio",   "sdi",      V_88F6928),
                 MPP_VAR_FUNCTION(5, "sd0",     "d6",       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(7, "i2c3",    "sck",      V_88F6920_PLUS)),
@@ -316,7 +316,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
                 MPP_VAR_FUNCTION(0, "gpio",    NULL,       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(1, "sata1",   "prsnt",    V_88F6928),
                 MPP_VAR_FUNCTION(2, "sata0",   "prsnt",    V_88F6928),
-                 MPP_VAR_FUNCTION(3, "tdm",     "rstn",     V_88F6928),
+                 MPP_VAR_FUNCTION(3, "tdm",     "rst",      V_88F6928),
                 MPP_VAR_FUNCTION(4, "audio",   "bclk",     V_88F6928),
                 MPP_VAR_FUNCTION(5, "sd0",     "d7",       V_88F6920_PLUS),
                 MPP_VAR_FUNCTION(7, "i2c3",    "sda",      V_88F6920_PLUS)),
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
index 93b0485bc886..9a8b71417620 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
@@ -252,7 +252,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
                 MPP_VAR_FUNCTION(0x1, "uart2", "rxd",      V_MV78230_PLUS),
                 MPP_VAR_FUNCTION(0x2, "uart0", "cts",      V_MV78230_PLUS),
                 MPP_VAR_FUNCTION(0x3, "tdm", "int7",       V_MV78230_PLUS),
-                 MPP_VAR_FUNCTION(0x4, "tdm-1", "timer",    V_MV78230_PLUS)),
+                 MPP_VAR_FUNCTION(0x4, "tdm", "timer",      V_MV78230_PLUS)),
        MPP_MODE(43,
                 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78230_PLUS),
                 MPP_VAR_FUNCTION(0x1, "uart2", "txd",      V_MV78230_PLUS),
author	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>	2015-06-09 12:47:08 -0400
committer	Linus Walleij <linus.walleij@linaro.org>	2015-06-10 07:35:33 -0400
commit	dae5597f253ae2d44432c8648d9a9205de057ddf (patch)
tree	ac9840c5a241616e0c93458c13199330d95365f7
parent	5cc0de1faff6ac801286dfab88e4a31392cbb3f0 (diff)

diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt index 183c4723d9c8..e6dce5d7ef8d 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
@@ -20,7 +20,7 @@ mpp3 3 gpio, i2c0(sda), uart0(rxd)
20	mpp4 4 gpio, cpu_pd(vdd)	20	mpp4 4 gpio, cpu_pd(vdd)
21	mpp5 5 gpo, ge0(txclko), uart1(txd), spi1(clk), audio(mclk)	21	mpp5 5 gpo, ge0(txclko), uart1(txd), spi1(clk), audio(mclk)
22	mpp6 6 gpio, ge0(txd0), sata0(prsnt), tdm(rst), audio(sdo)	22	mpp6 6 gpio, ge0(txd0), sata0(prsnt), tdm(rst), audio(sdo)
23	mpp7 7 gpo, ge0(txd1), tdm(tdx), audio(lrclk)	23	mpp7 7 gpo, ge0(txd1), tdm(dtx), audio(lrclk)
24	mpp8 8 gpio, ge0(txd2), uart0(rts), tdm(drx), audio(bclk)	24	mpp8 8 gpio, ge0(txd2), uart0(rts), tdm(drx), audio(bclk)
25	mpp9 9 gpo, ge0(txd3), uart1(txd), sd0(clk), audio(spdifo)	25	mpp9 9 gpo, ge0(txd3), uart1(txd), sd0(clk), audio(spdifo)
26	mpp10 10 gpio, ge0(txctl), uart0(cts), tdm(fsync), audio(sdi)	26	mpp10 10 gpio, ge0(txctl), uart0(cts), tdm(fsync), audio(sdi)


diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt index ce1771bd9106..314032481ccf 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
@@ -31,8 +31,8 @@ mpp14 14 gpio, i2c0(sda), uart1(txd)
31	mpp15 15 gpio, i2c0(sck), uart1(rxd)	31	mpp15 15 gpio, i2c0(sck), uart1(rxd)
32	mpp16 16 gpio, uart0(txd)	32	mpp16 16 gpio, uart0(txd)
33	mpp17 17 gpio, uart0(rxd)	33	mpp17 17 gpio, uart0(rxd)
34	mpp18 18 gpio, tdm(intn)	34	mpp18 18 gpio, tdm(int)
35	mpp19 19 gpio, tdm(rstn)	35	mpp19 19 gpio, tdm(rst)
36	mpp20 20 gpio, tdm(pclk)	36	mpp20 20 gpio, tdm(pclk)
37	mpp21 21 gpio, tdm(fsync)	37	mpp21 21 gpio, tdm(fsync)
38	mpp22 22 gpio, tdm(drx)	38	mpp22 22 gpio, tdm(drx)
@@ -50,7 +50,7 @@ mpp33 33 gpio, ge1(txd3), spi1(miso)
50	mpp34 34 gpio, ge1(txclkout), spi1(sck)	50	mpp34 34 gpio, ge1(txclkout), spi1(sck)
51	mpp35 35 gpio, ge1(rxctl), spi1(cs1), spi0(cs2)	51	mpp35 35 gpio, ge1(rxctl), spi1(cs1), spi0(cs2)
52	mpp36 36 gpio, pcie0(clkreq)	52	mpp36 36 gpio, pcie0(clkreq)
53	mpp37 37 gpio, pcie0(clkreq), tdm(intn), ge(mdc)	53	mpp37 37 gpio, pcie0(clkreq), tdm(int), ge(mdc)
54	mpp38 38 gpio, pcie1(clkreq), ge(mdio)	54	mpp38 38 gpio, pcie1(clkreq), ge(mdio)
55	mpp39 39 gpio, ref(clkout)	55	mpp39 39 gpio, ref(clkout)
56	mpp40 40 gpio, uart1(txd)	56	mpp40 40 gpio, uart1(txd)


diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt index 9844773032c5..203220d2392f 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
@@ -63,12 +63,12 @@ mpp44 44 gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3
63	mpp45 45 gpio, ref(clk_out0), pcie0(rstout)	63	mpp45 45 gpio, ref(clk_out0), pcie0(rstout)
64	mpp46 46 gpio, ref(clk_out1), pcie0(rstout)	64	mpp46 46 gpio, ref(clk_out1), pcie0(rstout)
65	mpp47 47 gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [2]	65	mpp47 47 gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [2]
66	mpp48 48 gpio, sata0(prsnt), dram(vttctrl), tdm2c(pclk), audio(mclk), sd0(d4), pcie0(clkreq)	66	mpp48 48 gpio, sata0(prsnt), dram(vttctrl), tdm(pclk), audio(mclk), sd0(d4), pcie0(clkreq)
67	mpp49 49 gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm2c(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)	67	mpp49 49 gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)
68	mpp50 50 gpio, pcie0(rstout), tdm2c(drx), audio(extclk), sd0(cmd)	68	mpp50 50 gpio, pcie0(rstout), tdm(drx), audio(extclk), sd0(cmd)
69	mpp51 51 gpio, tdm2c(dtx), audio(sdo), dram(deccerr)	69	mpp51 51 gpio, tdm(dtx), audio(sdo), dram(deccerr)
70	mpp52 52 gpio, pcie0(rstout), tdm2c(intn), audio(sdi), sd0(d6)	70	mpp52 52 gpio, pcie0(rstout), tdm(int), audio(sdi), sd0(d6)
71	mpp53 53 gpio, sata1(prsnt), sata0(prsnt), tdm2c(rstn), audio(bclk), sd0(d7)	71	mpp53 53 gpio, sata1(prsnt), sata0(prsnt), tdm(rst), audio(bclk), sd0(d7)
72	mpp54 54 gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3)	72	mpp54 54 gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3)
73	mpp55 55 gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0)	73	mpp55 55 gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0)
74	mpp56 56 gpio, ua1(rts), ge(mdc), dram(deccerr), spi1(mosi)	74	mpp56 56 gpio, ua1(rts), ge(mdc), dram(deccerr), spi1(mosi)


diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt index b6bd9cc09af8..1dd76e953725 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt
@@ -66,8 +66,8 @@ mpp48 48 gpio, sata0(prsnt) [1], dram(vttctrl), tdm(pclk) [1], audio(mclk) [1],
66	mpp49 49 gpio, tdm(fsync) [1], audio(lrclk) [1], sd0(d5), ua2(rxd)	66	mpp49 49 gpio, tdm(fsync) [1], audio(lrclk) [1], sd0(d5), ua2(rxd)
67	mpp50 50 gpio, pcie0(rstout), tdm(drx) [1], audio(extclk) [1], sd0(cmd), ua2(rxd)	67	mpp50 50 gpio, pcie0(rstout), tdm(drx) [1], audio(extclk) [1], sd0(cmd), ua2(rxd)
68	mpp51 51 gpio, tdm(dtx) [1], audio(sdo) [1], dram(deccerr), ua2(txd)	68	mpp51 51 gpio, tdm(dtx) [1], audio(sdo) [1], dram(deccerr), ua2(txd)
69	mpp52 52 gpio, pcie0(rstout), tdm(intn) [1], audio(sdi) [1], sd0(d6), i2c3(sck)	69	mpp52 52 gpio, pcie0(rstout), tdm(int) [1], audio(sdi) [1], sd0(d6), i2c3(sck)
70	mpp53 53 gpio, sata1(prsnt) [1], sata0(prsnt) [1], tdm(rstn) [1], audio(bclk) [1], sd0(d7), i2c3(sda)	70	mpp53 53 gpio, sata1(prsnt) [1], sata0(prsnt) [1], tdm(rst) [1], audio(bclk) [1], sd0(d7), i2c3(sda)
71	mpp54 54 gpio, sata0(prsnt) [1], sata1(prsnt) [1], pcie0(rstout), sd0(d3), ua3(txd)	71	mpp54 54 gpio, sata0(prsnt) [1], sata1(prsnt) [1], pcie0(rstout), sd0(d3), ua3(txd)
72	mpp55 55 gpio, ua1(cts), spi1(cs1), sd0(d0), ua1(rxd), ua3(rxd)	72	mpp55 55 gpio, ua1(cts), spi1(cs1), sd0(d0), ua1(rxd), ua3(rxd)
73	mpp56 56 gpio, ua1(rts), dram(deccerr), spi1(mosi), ua1(txd)	73	mpp56 56 gpio, ua1(rts), dram(deccerr), spi1(mosi), ua1(txd)


diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt index cefca173366e..561e5190f5ac 100644 --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
@@ -61,7 +61,7 @@ mpp39 39 gpio, spi(cs0)
61	mpp40 40 gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)	61	mpp40 40 gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)
62	mpp41 41 gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),	62	mpp41 41 gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),
63	pcie(clkreq1)	63	pcie(clkreq1)
64	mpp42 42 gpio, uart2(rxd), uart0(cts), tdm(int7), tdm-1(timer)	64	mpp42 42 gpio, uart2(rxd), uart0(cts), tdm(int7), tdm(timer)
65	mpp43 43 gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout)	65	mpp43 43 gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout)
66	mpp44 44 gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),	66	mpp44 44 gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),
67	dram(bat)	67	dram(bat)


diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c index 7d2be71f0237..fe5cfd11ed66 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -68,7 +68,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
68	MPP_MODE(7,	68	MPP_MODE(7,
69	MPP_FUNCTION(0x0, "gpo", NULL),	69	MPP_FUNCTION(0x0, "gpo", NULL),
70	MPP_FUNCTION(0x1, "ge0", "txd1"),	70	MPP_FUNCTION(0x1, "ge0", "txd1"),
71	MPP_FUNCTION(0x4, "tdm", "tdx"),	71	MPP_FUNCTION(0x4, "tdm", "dtx"),
72	MPP_FUNCTION(0x5, "audio", "lrclk")),	72	MPP_FUNCTION(0x5, "audio", "lrclk")),
73	MPP_MODE(8,	73	MPP_MODE(8,
74	MPP_FUNCTION(0x0, "gpio", NULL),	74	MPP_FUNCTION(0x0, "gpio", NULL),


diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-375.c b/drivers/pinctrl/mvebu/pinctrl-armada-375.c index 6dfe1bfff575..c41dd19f321a 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-375.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-375.c
@@ -141,10 +141,10 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
141	MPP_FUNCTION(0x2, "uart0", "rxd")),	141	MPP_FUNCTION(0x2, "uart0", "rxd")),
142	MPP_MODE(18,	142	MPP_MODE(18,
143	MPP_FUNCTION(0x0, "gpio", NULL),	143	MPP_FUNCTION(0x0, "gpio", NULL),
144	MPP_FUNCTION(0x2, "tdm", "intn")),	144	MPP_FUNCTION(0x2, "tdm", "int")),
145	MPP_MODE(19,	145	MPP_MODE(19,
146	MPP_FUNCTION(0x0, "gpio", NULL),	146	MPP_FUNCTION(0x0, "gpio", NULL),
147	MPP_FUNCTION(0x2, "tdm", "rstn")),	147	MPP_FUNCTION(0x2, "tdm", "rst")),
148	MPP_MODE(20,	148	MPP_MODE(20,
149	MPP_FUNCTION(0x0, "gpio", NULL),	149	MPP_FUNCTION(0x0, "gpio", NULL),
150	MPP_FUNCTION(0x2, "tdm", "pclk")),	150	MPP_FUNCTION(0x2, "tdm", "pclk")),
@@ -242,7 +242,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
242	MPP_MODE(37,	242	MPP_MODE(37,
243	MPP_FUNCTION(0x0, "gpio", NULL),	243	MPP_FUNCTION(0x0, "gpio", NULL),
244	MPP_FUNCTION(0x1, "pcie0", "clkreq"),	244	MPP_FUNCTION(0x1, "pcie0", "clkreq"),
245	MPP_FUNCTION(0x2, "tdm", "intn"),	245	MPP_FUNCTION(0x2, "tdm", "int"),
246	MPP_FUNCTION(0x4, "ge", "mdc")),	246	MPP_FUNCTION(0x4, "ge", "mdc")),
247	MPP_MODE(38,	247	MPP_MODE(38,
248	MPP_FUNCTION(0x0, "gpio", NULL),	248	MPP_FUNCTION(0x0, "gpio", NULL),


diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c index 793d0dfec220..b5006f769d59 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
@@ -303,7 +303,7 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
303	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),	303	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
304	MPP_VAR_FUNCTION(1, "sata0", "prsnt", V_88F6810_PLUS),	304	MPP_VAR_FUNCTION(1, "sata0", "prsnt", V_88F6810_PLUS),
305	MPP_VAR_FUNCTION(2, "dram", "vttctrl", V_88F6810_PLUS),	305	MPP_VAR_FUNCTION(2, "dram", "vttctrl", V_88F6810_PLUS),
306	MPP_VAR_FUNCTION(3, "tdm2c", "pclk", V_88F6810_PLUS),	306	MPP_VAR_FUNCTION(3, "tdm", "pclk", V_88F6810_PLUS),
307	MPP_VAR_FUNCTION(4, "audio", "mclk", V_88F6810_PLUS),	307	MPP_VAR_FUNCTION(4, "audio", "mclk", V_88F6810_PLUS),
308	MPP_VAR_FUNCTION(5, "sd0", "d4", V_88F6810_PLUS),	308	MPP_VAR_FUNCTION(5, "sd0", "d4", V_88F6810_PLUS),
309	MPP_VAR_FUNCTION(6, "pcie0", "clkreq", V_88F6810_PLUS)),	309	MPP_VAR_FUNCTION(6, "pcie0", "clkreq", V_88F6810_PLUS)),
@@ -311,32 +311,32 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
311	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),	311	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
312	MPP_VAR_FUNCTION(1, "sata2", "prsnt", V_88F6828),	312	MPP_VAR_FUNCTION(1, "sata2", "prsnt", V_88F6828),
313	MPP_VAR_FUNCTION(2, "sata3", "prsnt", V_88F6828),	313	MPP_VAR_FUNCTION(2, "sata3", "prsnt", V_88F6828),
314	MPP_VAR_FUNCTION(3, "tdm2c", "fsync", V_88F6810_PLUS),	314	MPP_VAR_FUNCTION(3, "tdm", "fsync", V_88F6810_PLUS),
315	MPP_VAR_FUNCTION(4, "audio", "lrclk", V_88F6810_PLUS),	315	MPP_VAR_FUNCTION(4, "audio", "lrclk", V_88F6810_PLUS),
316	MPP_VAR_FUNCTION(5, "sd0", "d5", V_88F6810_PLUS),	316	MPP_VAR_FUNCTION(5, "sd0", "d5", V_88F6810_PLUS),
317	MPP_VAR_FUNCTION(6, "pcie1", "clkreq", V_88F6820_PLUS)),	317	MPP_VAR_FUNCTION(6, "pcie1", "clkreq", V_88F6820_PLUS)),
318	MPP_MODE(50,	318	MPP_MODE(50,
319	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),	319	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
320	MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6810_PLUS),	320	MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6810_PLUS),
321	MPP_VAR_FUNCTION(3, "tdm2c", "drx", V_88F6810_PLUS),	321	MPP_VAR_FUNCTION(3, "tdm", "drx", V_88F6810_PLUS),
322	MPP_VAR_FUNCTION(4, "audio", "extclk", V_88F6810_PLUS),	322	MPP_VAR_FUNCTION(4, "audio", "extclk", V_88F6810_PLUS),
323	MPP_VAR_FUNCTION(5, "sd0", "cmd", V_88F6810_PLUS)),	323	MPP_VAR_FUNCTION(5, "sd0", "cmd", V_88F6810_PLUS)),
324	MPP_MODE(51,	324	MPP_MODE(51,
325	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),	325	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
326	MPP_VAR_FUNCTION(3, "tdm2c", "dtx", V_88F6810_PLUS),	326	MPP_VAR_FUNCTION(3, "tdm", "dtx", V_88F6810_PLUS),
327	MPP_VAR_FUNCTION(4, "audio", "sdo", V_88F6810_PLUS),	327	MPP_VAR_FUNCTION(4, "audio", "sdo", V_88F6810_PLUS),
328	MPP_VAR_FUNCTION(5, "dram", "deccerr", V_88F6810_PLUS)),	328	MPP_VAR_FUNCTION(5, "dram", "deccerr", V_88F6810_PLUS)),
329	MPP_MODE(52,	329	MPP_MODE(52,
330	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),	330	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
331	MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6810_PLUS),	331	MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6810_PLUS),
332	MPP_VAR_FUNCTION(3, "tdm2c", "intn", V_88F6810_PLUS),	332	MPP_VAR_FUNCTION(3, "tdm", "int", V_88F6810_PLUS),
333	MPP_VAR_FUNCTION(4, "audio", "sdi", V_88F6810_PLUS),	333	MPP_VAR_FUNCTION(4, "audio", "sdi", V_88F6810_PLUS),
334	MPP_VAR_FUNCTION(5, "sd0", "d6", V_88F6810_PLUS)),	334	MPP_VAR_FUNCTION(5, "sd0", "d6", V_88F6810_PLUS)),
335	MPP_MODE(53,	335	MPP_MODE(53,
336	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),	336	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
337	MPP_VAR_FUNCTION(1, "sata1", "prsnt", V_88F6810_PLUS),	337	MPP_VAR_FUNCTION(1, "sata1", "prsnt", V_88F6810_PLUS),
338	MPP_VAR_FUNCTION(2, "sata0", "prsnt", V_88F6810_PLUS),	338	MPP_VAR_FUNCTION(2, "sata0", "prsnt", V_88F6810_PLUS),
339	MPP_VAR_FUNCTION(3, "tdm2c", "rstn", V_88F6810_PLUS),	339	MPP_VAR_FUNCTION(3, "tdm", "rst", V_88F6810_PLUS),
340	MPP_VAR_FUNCTION(4, "audio", "bclk", V_88F6810_PLUS),	340	MPP_VAR_FUNCTION(4, "audio", "bclk", V_88F6810_PLUS),
341	MPP_VAR_FUNCTION(5, "sd0", "d7", V_88F6810_PLUS)),	341	MPP_VAR_FUNCTION(5, "sd0", "d7", V_88F6810_PLUS)),
342	MPP_MODE(54,	342	MPP_MODE(54,


diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c index de91b3598653..433291a1540a 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-39x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-39x.c
@@ -308,7 +308,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
308	MPP_MODE(52,	308	MPP_MODE(52,
309	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6920_PLUS),	309	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6920_PLUS),
310	MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6920_PLUS),	310	MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6920_PLUS),
311	MPP_VAR_FUNCTION(3, "tdm", "intn", V_88F6928),	311	MPP_VAR_FUNCTION(3, "tdm", "int", V_88F6928),
312	MPP_VAR_FUNCTION(4, "audio", "sdi", V_88F6928),	312	MPP_VAR_FUNCTION(4, "audio", "sdi", V_88F6928),
313	MPP_VAR_FUNCTION(5, "sd0", "d6", V_88F6920_PLUS),	313	MPP_VAR_FUNCTION(5, "sd0", "d6", V_88F6920_PLUS),
314	MPP_VAR_FUNCTION(7, "i2c3", "sck", V_88F6920_PLUS)),	314	MPP_VAR_FUNCTION(7, "i2c3", "sck", V_88F6920_PLUS)),
@@ -316,7 +316,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
316	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6920_PLUS),	316	MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6920_PLUS),
317	MPP_VAR_FUNCTION(1, "sata1", "prsnt", V_88F6928),	317	MPP_VAR_FUNCTION(1, "sata1", "prsnt", V_88F6928),
318	MPP_VAR_FUNCTION(2, "sata0", "prsnt", V_88F6928),	318	MPP_VAR_FUNCTION(2, "sata0", "prsnt", V_88F6928),
319	MPP_VAR_FUNCTION(3, "tdm", "rstn", V_88F6928),	319	MPP_VAR_FUNCTION(3, "tdm", "rst", V_88F6928),
320	MPP_VAR_FUNCTION(4, "audio", "bclk", V_88F6928),	320	MPP_VAR_FUNCTION(4, "audio", "bclk", V_88F6928),
321	MPP_VAR_FUNCTION(5, "sd0", "d7", V_88F6920_PLUS),	321	MPP_VAR_FUNCTION(5, "sd0", "d7", V_88F6920_PLUS),
322	MPP_VAR_FUNCTION(7, "i2c3", "sda", V_88F6920_PLUS)),	322	MPP_VAR_FUNCTION(7, "i2c3", "sda", V_88F6920_PLUS)),


diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c index 93b0485bc886..9a8b71417620 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
@@ -252,7 +252,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
252	MPP_VAR_FUNCTION(0x1, "uart2", "rxd", V_MV78230_PLUS),	252	MPP_VAR_FUNCTION(0x1, "uart2", "rxd", V_MV78230_PLUS),
253	MPP_VAR_FUNCTION(0x2, "uart0", "cts", V_MV78230_PLUS),	253	MPP_VAR_FUNCTION(0x2, "uart0", "cts", V_MV78230_PLUS),
254	MPP_VAR_FUNCTION(0x3, "tdm", "int7", V_MV78230_PLUS),	254	MPP_VAR_FUNCTION(0x3, "tdm", "int7", V_MV78230_PLUS),
255	MPP_VAR_FUNCTION(0x4, "tdm-1", "timer", V_MV78230_PLUS)),	255	MPP_VAR_FUNCTION(0x4, "tdm", "timer", V_MV78230_PLUS)),
256	MPP_MODE(43,	256	MPP_MODE(43,
257	MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),	257	MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
258	MPP_VAR_FUNCTION(0x1, "uart2", "txd", V_MV78230_PLUS),	258	MPP_VAR_FUNCTION(0x1, "uart2", "txd", V_MV78230_PLUS),