aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 12:47:23 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-06-10 08:30:44 -0400
commitf9dbbe011cce41905db77b97e38928b30b1792d5 (patch)
treeb9c0a3785d094f17df835caf2184ad4412fff592
parentf7ad5b29ce7272da9589aabfa4d94502881b9556 (diff)
pinctrl: mvebu: armada-38x: add ptp functions
The latest version of the Armada 38x datasheet documents several new PTP 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>
-rw-r--r--Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt6
-rw-r--r--drivers/pinctrl/mvebu/pinctrl-armada-38x.c9
2 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
index 4330676f890d..54ec4c0a0d0e 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt
@@ -66,9 +66,9 @@ mpp47 47 gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3
66mpp48 48 gpio, sata0(prsnt), dram(vttctrl), tdm(pclk), audio(mclk), sd0(d4), pcie0(clkreq) 66mpp48 48 gpio, sata0(prsnt), dram(vttctrl), tdm(pclk), audio(mclk), sd0(d4), pcie0(clkreq)
67mpp49 49 gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm(fsync), audio(lrclk), sd0(d5), pcie1(clkreq) 67mpp49 49 gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)
68mpp50 50 gpio, pcie0(rstout), tdm(drx), audio(extclk), sd0(cmd) 68mpp50 50 gpio, pcie0(rstout), tdm(drx), audio(extclk), sd0(cmd)
69mpp51 51 gpio, tdm(dtx), audio(sdo), dram(deccerr) 69mpp51 51 gpio, tdm(dtx), audio(sdo), dram(deccerr), ptp(trig)
70mpp52 52 gpio, pcie0(rstout), tdm(int), audio(sdi), sd0(d6) 70mpp52 52 gpio, pcie0(rstout), tdm(int), audio(sdi), sd0(d6), ptp(clk)
71mpp53 53 gpio, sata1(prsnt), sata0(prsnt), tdm(rst), audio(bclk), sd0(d7) 71mpp53 53 gpio, sata1(prsnt), sata0(prsnt), tdm(rst), audio(bclk), sd0(d7), ptp(evreq)
72mpp54 54 gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3) 72mpp54 54 gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3)
73mpp55 55 gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0), ua1(rxd) 73mpp55 55 gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0), ua1(rxd)
74mpp56 56 gpio, ua1(rts), ge(mdc), dram(deccerr), spi1(mosi), ua1(txd) 74mpp56 56 gpio, ua1(rts), ge(mdc), dram(deccerr), spi1(mosi), ua1(txd)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
index 370c73b52ea0..6ec82c62dff7 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c
@@ -331,20 +331,23 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
331 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), 331 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
332 MPP_VAR_FUNCTION(3, "tdm", "dtx", V_88F6810_PLUS), 332 MPP_VAR_FUNCTION(3, "tdm", "dtx", V_88F6810_PLUS),
333 MPP_VAR_FUNCTION(4, "audio", "sdo", V_88F6810_PLUS), 333 MPP_VAR_FUNCTION(4, "audio", "sdo", V_88F6810_PLUS),
334 MPP_VAR_FUNCTION(5, "dram", "deccerr", V_88F6810_PLUS)), 334 MPP_VAR_FUNCTION(5, "dram", "deccerr", V_88F6810_PLUS),
335 MPP_VAR_FUNCTION(6, "ptp", "trig", V_88F6810_PLUS)),
335 MPP_MODE(52, 336 MPP_MODE(52,
336 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), 337 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
337 MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6810_PLUS), 338 MPP_VAR_FUNCTION(1, "pcie0", "rstout", V_88F6810_PLUS),
338 MPP_VAR_FUNCTION(3, "tdm", "int", V_88F6810_PLUS), 339 MPP_VAR_FUNCTION(3, "tdm", "int", V_88F6810_PLUS),
339 MPP_VAR_FUNCTION(4, "audio", "sdi", V_88F6810_PLUS), 340 MPP_VAR_FUNCTION(4, "audio", "sdi", V_88F6810_PLUS),
340 MPP_VAR_FUNCTION(5, "sd0", "d6", V_88F6810_PLUS)), 341 MPP_VAR_FUNCTION(5, "sd0", "d6", V_88F6810_PLUS),
342 MPP_VAR_FUNCTION(6, "ptp", "clk", V_88F6810_PLUS)),
341 MPP_MODE(53, 343 MPP_MODE(53,
342 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), 344 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
343 MPP_VAR_FUNCTION(1, "sata1", "prsnt", V_88F6810_PLUS), 345 MPP_VAR_FUNCTION(1, "sata1", "prsnt", V_88F6810_PLUS),
344 MPP_VAR_FUNCTION(2, "sata0", "prsnt", V_88F6810_PLUS), 346 MPP_VAR_FUNCTION(2, "sata0", "prsnt", V_88F6810_PLUS),
345 MPP_VAR_FUNCTION(3, "tdm", "rst", V_88F6810_PLUS), 347 MPP_VAR_FUNCTION(3, "tdm", "rst", V_88F6810_PLUS),
346 MPP_VAR_FUNCTION(4, "audio", "bclk", V_88F6810_PLUS), 348 MPP_VAR_FUNCTION(4, "audio", "bclk", V_88F6810_PLUS),
347 MPP_VAR_FUNCTION(5, "sd0", "d7", V_88F6810_PLUS)), 349 MPP_VAR_FUNCTION(5, "sd0", "d7", V_88F6810_PLUS),
350 MPP_VAR_FUNCTION(6, "ptp", "evreq", V_88F6810_PLUS)),
348 MPP_MODE(54, 351 MPP_MODE(54,
349 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), 352 MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS),
350 MPP_VAR_FUNCTION(1, "sata0", "prsnt", V_88F6810_PLUS), 353 MPP_VAR_FUNCTION(1, "sata0", "prsnt", V_88F6810_PLUS),