Commit f32f01e1 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Linus Walleij
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d4974c16

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ mpp58 58 gpio, dev(cs0), uart1(rts), tdm(int), audio(extclk), 
mpp59         59       gpo, dev(ale0), uart1(rts), uart0(rts), audio(bclk)

mpp59         59       gpo, dev(ale0), uart1(rts), uart0(rts), audio(bclk)

mpp60         60       gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout),

mpp60         60       gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout),

                       audio(sdi)

                       audio(sdi)

mpp61         61       gpo, dev(we1), uart1(txd), audio(rclk)

mpp61         61       gpo, dev(we1), uart1(txd), audio(lrclk)

mpp62         62       gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),

mpp62         62       gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),

                       audio(mclk), uart0(cts)

                       audio(mclk), uart0(cts)

mpp63         63       gpo, spi0(sck), tclk

mpp63         63       gpo, spi0(sck), tclk

Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ mpp2 2 gpio, dev(ad4), ptp(evreq), led(c0), audio(sdi) 
mpp3          3        gpio, dev(ad5), ptp(trig), led(p3), audio(mclk)

mpp3          3        gpio, dev(ad5), ptp(trig), led(p3), audio(mclk)

mpp4          4        gpio, dev(ad6), spi0(miso), spi1(miso)

mpp4          4        gpio, dev(ad6), spi0(miso), spi1(miso)

mpp5          5        gpio, dev(ad7), spi0(cs2), spi1(cs2)

mpp5          5        gpio, dev(ad7), spi0(cs2), spi1(cs2)

mpp6          6        gpio, dev(ad0), led(p1), audio(rclk)

mpp6          6        gpio, dev(ad0), led(p1), audio(lrclk)

mpp7          7        gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)

mpp7          7        gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)

mpp8          8        gpio, dev (bootcs), spi0(cs0), spi1(cs0)

mpp8          8        gpio, dev (bootcs), spi0(cs0), spi1(cs0)

mpp9          9        gpio, spi0(sck), spi1(sck), nand(we)

mpp9          9        gpio, spi0(sck), spi1(sck), nand(we)

drivers/pinctrl/mvebu/pinctrl-armada-370.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -354,7 +354,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = { 
	   MPP_FUNCTION(0x0, "gpo", NULL),

	   MPP_FUNCTION(0x0, "gpo", NULL),

	   MPP_FUNCTION(0x1, "dev", "we1"),

	   MPP_FUNCTION(0x1, "dev", "we1"),

	   MPP_FUNCTION(0x2, "uart1", "txd"),

	   MPP_FUNCTION(0x2, "uart1", "txd"),

	   MPP_FUNCTION(0x5, "audio", "rclk")),

	   MPP_FUNCTION(0x5, "audio", "lrclk")),

	MPP_MODE(62,

	MPP_MODE(62,

	   MPP_FUNCTION(0x0, "gpio", NULL),

	   MPP_FUNCTION(0x0, "gpio", NULL),

	   MPP_FUNCTION(0x1, "dev", "a2"),

	   MPP_FUNCTION(0x1, "dev", "a2"),

drivers/pinctrl/mvebu/pinctrl-armada-375.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = { 
		 MPP_FUNCTION(0x0, "gpio", NULL),

		 MPP_FUNCTION(0x0, "gpio", NULL),

		 MPP_FUNCTION(0x1, "dev", "ad0"),

		 MPP_FUNCTION(0x1, "dev", "ad0"),

		 MPP_FUNCTION(0x3, "led", "p1"),

		 MPP_FUNCTION(0x3, "led", "p1"),

		 MPP_FUNCTION(0x4, "audio", "rclk"),

		 MPP_FUNCTION(0x4, "audio", "lrclk"),

		 MPP_FUNCTION(0x5, "nand", "io0")),

		 MPP_FUNCTION(0x5, "nand", "io0")),

	MPP_MODE(7,

	MPP_MODE(7,

		 MPP_FUNCTION(0x0, "gpio", NULL),

		 MPP_FUNCTION(0x0, "gpio", NULL),