aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 12:47:10 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-06-10 07:43:52 -0400
commitf32f01e1ba6bca9611c835eb357ce926038128e8 (patch)
treee8dec6c33b2f0bf83aa3d5b65cb8e80d6726339a
parentd4974c16ed22f6b19b67d95d63c7244dbe87d95b (diff)
pinctrl: mvebu: armada-{370,375}: normalize audio pins
This commit aligns the naming of the audio 'lrclk' pin accross Marvell SoCs. Since only the subname is changed, the DT backward compatibility is not affected. 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-370-pinctrl.txt2
-rw-r--r--Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt2
-rw-r--r--drivers/pinctrl/mvebu/pinctrl-armada-370.c2
-rw-r--r--drivers/pinctrl/mvebu/pinctrl-armada-375.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
index 24a745008a33..cc0be9df7082 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
@@ -88,7 +88,7 @@ mpp58 58 gpio, dev(cs0), uart1(rts), tdm(int), audio(extclk),
88mpp59 59 gpo, dev(ale0), uart1(rts), uart0(rts), audio(bclk) 88mpp59 59 gpo, dev(ale0), uart1(rts), uart0(rts), audio(bclk)
89mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), 89mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout),
90 audio(sdi) 90 audio(sdi)
91mpp61 61 gpo, dev(we1), uart1(txd), audio(rclk) 91mpp61 61 gpo, dev(we1), uart1(txd), audio(lrclk)
92mpp62 62 gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0), 92mpp62 62 gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),
93 audio(mclk), uart0(cts) 93 audio(mclk), uart0(cts)
94mpp63 63 gpo, spi0(sck), tclk 94mpp63 63 gpo, spi0(sck), tclk
diff --git a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
index f942a006a814..06e5bb0367f5 100644
--- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt
@@ -19,7 +19,7 @@ mpp2 2 gpio, dev(ad4), ptp(evreq), led(c0), audio(sdi)
19mpp3 3 gpio, dev(ad5), ptp(trig), led(p3), audio(mclk) 19mpp3 3 gpio, dev(ad5), ptp(trig), led(p3), audio(mclk)
20mpp4 4 gpio, dev(ad6), spi0(miso), spi1(miso) 20mpp4 4 gpio, dev(ad6), spi0(miso), spi1(miso)
21mpp5 5 gpio, dev(ad7), spi0(cs2), spi1(cs2) 21mpp5 5 gpio, dev(ad7), spi0(cs2), spi1(cs2)
22mpp6 6 gpio, dev(ad0), led(p1), audio(rclk) 22mpp6 6 gpio, dev(ad0), led(p1), audio(lrclk)
23mpp7 7 gpio, dev(ad1), ptp(clk), led(p2), audio(extclk) 23mpp7 7 gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)
24mpp8 8 gpio, dev (bootcs), spi0(cs0), spi1(cs0) 24mpp8 8 gpio, dev (bootcs), spi0(cs0), spi1(cs0)
25mpp9 9 gpio, spi0(sck), spi1(sck), nand(we) 25mpp9 9 gpio, spi0(sck), spi1(sck), nand(we)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-370.c b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
index 6ecec9071276..54fec8cc608c 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-370.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-370.c
@@ -354,7 +354,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
354 MPP_FUNCTION(0x0, "gpo", NULL), 354 MPP_FUNCTION(0x0, "gpo", NULL),
355 MPP_FUNCTION(0x1, "dev", "we1"), 355 MPP_FUNCTION(0x1, "dev", "we1"),
356 MPP_FUNCTION(0x2, "uart1", "txd"), 356 MPP_FUNCTION(0x2, "uart1", "txd"),
357 MPP_FUNCTION(0x5, "audio", "rclk")), 357 MPP_FUNCTION(0x5, "audio", "lrclk")),
358 MPP_MODE(62, 358 MPP_MODE(62,
359 MPP_FUNCTION(0x0, "gpio", NULL), 359 MPP_FUNCTION(0x0, "gpio", NULL),
360 MPP_FUNCTION(0x1, "dev", "a2"), 360 MPP_FUNCTION(0x1, "dev", "a2"),
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-375.c b/drivers/pinctrl/mvebu/pinctrl-armada-375.c
index 4d3e23517bed..54e9fbd0121f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-375.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-375.c
@@ -81,7 +81,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
81 MPP_FUNCTION(0x0, "gpio", NULL), 81 MPP_FUNCTION(0x0, "gpio", NULL),
82 MPP_FUNCTION(0x1, "dev", "ad0"), 82 MPP_FUNCTION(0x1, "dev", "ad0"),
83 MPP_FUNCTION(0x3, "led", "p1"), 83 MPP_FUNCTION(0x3, "led", "p1"),
84 MPP_FUNCTION(0x4, "audio", "rclk"), 84 MPP_FUNCTION(0x4, "audio", "lrclk"),
85 MPP_FUNCTION(0x5, "nand", "io0")), 85 MPP_FUNCTION(0x5, "nand", "io0")),
86 MPP_MODE(7, 86 MPP_MODE(7,
87 MPP_FUNCTION(0x0, "gpio", NULL), 87 MPP_FUNCTION(0x0, "gpio", NULL),