Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dae5597f authored Jun 09, 2015 by Thomas Petazzoni Committed by Linus Walleij Jun 10, 2015

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>

parent 5cc0de1f

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@ mpp3 3 gpio, i2c0(sda), uart0(rxd)
	mpp4 4 gpio, cpu_pd(vdd)		mpp4 4 gpio, cpu_pd(vdd)
	mpp5 5 gpo, ge0(txclko), uart1(txd), spi1(clk), audio(mclk)		mpp5 5 gpo, ge0(txclko), uart1(txd), spi1(clk), audio(mclk)
	mpp6 6 gpio, ge0(txd0), sata0(prsnt), tdm(rst), audio(sdo)		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)		mpp8 8 gpio, ge0(txd2), uart0(rts), tdm(drx), audio(bclk)
	mpp9 9 gpo, ge0(txd3), uart1(txd), sd0(clk), audio(spdifo)		mpp9 9 gpo, ge0(txd3), uart1(txd), sd0(clk), audio(spdifo)
	mpp10 10 gpio, ge0(txctl), uart0(cts), tdm(fsync), audio(sdi)		mpp10 10 gpio, ge0(txctl), uart0(cts), tdm(fsync), audio(sdi)

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -31,8 +31,8 @@ mpp14 14 gpio, i2c0(sda), uart1(txd)
	mpp15 15 gpio, i2c0(sck), uart1(rxd)		mpp15 15 gpio, i2c0(sck), uart1(rxd)
	mpp16 16 gpio, uart0(txd)		mpp16 16 gpio, uart0(txd)
	mpp17 17 gpio, uart0(rxd)		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)		mpp20 20 gpio, tdm(pclk)
	mpp21 21 gpio, tdm(fsync)		mpp21 21 gpio, tdm(fsync)
	mpp22 22 gpio, tdm(drx)		mpp22 22 gpio, tdm(drx)
	@@ -50,7 +50,7 @@ mpp33 33 gpio, ge1(txd3), spi1(miso)
	mpp34 34 gpio, ge1(txclkout), spi1(sck)		mpp34 34 gpio, ge1(txclkout), spi1(sck)
	mpp35 35 gpio, ge1(rxctl), spi1(cs1), spi0(cs2)		mpp35 35 gpio, ge1(rxctl), spi1(cs1), spi0(cs2)
	mpp36 36 gpio, pcie0(clkreq)		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)		mpp38 38 gpio, pcie1(clkreq), ge(mdio)
	mpp39 39 gpio, ref(clkout)		mpp39 39 gpio, ref(clkout)
	mpp40 40 gpio, uart1(txd)		mpp40 40 gpio, uart1(txd)

Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -63,12 +63,12 @@ mpp44 44 gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3
	mpp45 45 gpio, ref(clk_out0), pcie0(rstout)		mpp45 45 gpio, ref(clk_out0), pcie0(rstout)
	mpp46 46 gpio, ref(clk_out1), pcie0(rstout)		mpp46 46 gpio, ref(clk_out1), pcie0(rstout)
	mpp47 47 gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [2]		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)		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)		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)		mpp56 56 gpio, ua1(rts), ge(mdc), dram(deccerr), spi1(mosi)

Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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)		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)		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)		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)		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)		mpp55 55 gpio, ua1(cts), spi1(cs1), sd0(d0), ua1(rxd), ua3(rxd)
	mpp56 56 gpio, ua1(rts), dram(deccerr), spi1(mosi), ua1(txd)		mpp56 56 gpio, ua1(rts), dram(deccerr), spi1(mosi), ua1(txd)

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,7 @@ mpp39 39 gpio, spi(cs0)
	mpp40 40 gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)		mpp40 40 gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)
	mpp41 41 gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),		mpp41 41 gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),
	pcie(clkreq1)		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)		mpp43 43 gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout)
	mpp44 44 gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),		mpp44 44 gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),
	dram(bat)		dram(bat)