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

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

pinctrl: mvebu: armada-370: fix spi0 pin description 



Due to a mistake, the CS0 and CS1 SPI0 functions were incorrectly
named "spi0-1" instead of just "spi0". This commit fixes that.

This DT binding change does not affect any of the in-tree users.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.7+
Fixes: 5f597bb2 ("pinctrl: mvebu: add pinctrl driver for Armada 370")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 331642fb

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -92,5 +92,5 @@ mpp61 61 gpo, dev(wen1), uart1(txd), audio(rclk) 
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

mpp64         64       gpio, spi0(miso), spi0-1(cs1)

mpp64         64       gpio, spi0(miso), spi0(cs1)

mpp65         65       gpio, spi0(mosi), spi0-1(cs2)
 
mpp65         65       gpio, spi0(mosi), spi0(cs2)

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -370,11 +370,11 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = { 
	MPP_MODE(64,

	MPP_MODE(64,

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

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

	   MPP_FUNCTION(0x1, "spi0", "miso"),

	   MPP_FUNCTION(0x1, "spi0", "miso"),

	   MPP_FUNCTION(0x2, "spi0-1", "cs1")),

	   MPP_FUNCTION(0x2, "spi0", "cs1")),

	MPP_MODE(65,

	MPP_MODE(65,

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

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

	   MPP_FUNCTION(0x1, "spi0", "mosi"),

	   MPP_FUNCTION(0x1, "spi0", "mosi"),

	   MPP_FUNCTION(0x2, "spi0-1", "cs2")),

	   MPP_FUNCTION(0x2, "spi0", "cs2")),

};

};





static struct mvebu_pinctrl_soc_info armada_370_pinctrl_info;

static struct mvebu_pinctrl_soc_info armada_370_pinctrl_info;