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

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

pinctrl: mvebu: armada-xp: remove non-existing NAND pins 



After updating to a more recent version of the Armada XP datasheet, we
realized that some of the pins documented as having a NAND-related
functionality in fact did not have such functionality. This commit
updates the pinctrl driver accordingly.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ mpp20 20 gpio, ge0(rxd4), ge1(rxd2), lcd(d20), ptp(clk) 
mpp21         21       gpio, ge0(rxd5), ge1(rxd3), lcd(d21), mem(bat)

mpp22         22       gpio, ge0(rxd6), ge1(rxctl), lcd(d22), sata0(prsnt)

mpp23         23       gpio, ge0(rxd7), ge1(rxclk), lcd(d23), sata1(prsnt)

mpp24         24       gpio, lcd(hsync), sata1(prsnt), nf(bootcs-re), tdm(rst)

mpp25         25       gpio, lcd(vsync), sata0(prsnt), nf(bootcs-we), tdm(pclk)

mpp24         24       gpio, lcd(hsync), sata1(prsnt), tdm(rst)

mpp25         25       gpio, lcd(vsync), sata0(prsnt), tdm(pclk)

mpp26         26       gpio, lcd(clk), tdm(fsync), vdd(cpu1-pd)

mpp27         27       gpio, lcd(e), tdm(dtx), ptp(trig)

mpp28         28       gpio, lcd(pwm), tdm(drx), ptp(evreq)

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

+0 −2
Original line number Diff line number Diff line
@@ -172,13 +172,11 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = { 
	MPP_MODE(24,

		 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x1, "sata1", "prsnt",    V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x2, "nf", "bootcs-re",   V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x3, "tdm", "rst",        V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x4, "lcd", "hsync",      V_MV78230_PLUS)),

	MPP_MODE(25,

		 MPP_VAR_FUNCTION(0x0, "gpio", NULL,        V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x1, "sata0", "prsnt",    V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x2, "nf", "bootcs-we",   V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x3, "tdm", "pclk",       V_MV78230_PLUS),

		 MPP_VAR_FUNCTION(0x4, "lcd", "vsync",      V_MV78230_PLUS)),

	MPP_MODE(26,