Patch "pinctrl: mvebu: armada-375: remove non-existing NAND re/we pins" has been added to the 4.1-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
pinctrl: mvebu: armada-375: remove non-existing NAND re/we pins
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pinctrl-mvebu-armada-375-remove-non-existing-nand-re-we-pins.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e5447d26092c72ef3346615ee558c9112ef8063fMon Sep 17 00:00:00 2001
From: Thomas Petazzoni <[email protected]>
Date: Tue, 9 Jun 2015 18:46:55 +0200
Subject: pinctrl: mvebu: armada-375: remove non-existing NAND re/we pins
From: Thomas Petazzoni <[email protected]>
commit e5447d26092c72ef3346615ee558c9112ef8063f upstream.
After updating to a more recent version of the Armada 375, 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.
--- Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt | 4 ++-- drivers/pinctrl/mvebu/pinctrl-armada-375.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt +2 -2
@@ -22,8 +22,8 @@ mpp5 5 gpio, dev(ad7), s mpp6 6 gpio, dev(ad0), led(p1), audio(rclk) mpp7 7 gpio, dev(ad1), ptp(clk), led(p2), audio(extclk) mpp8 8 gpio, dev (bootcs), spi0(cs0), spi1(cs0) -mpp9 9 gpio, nf(wen), spi0(sck), spi1(sck) -mpp10 10 gpio, nf(ren), dram(vttctrl), led(c1) +mpp9 9 gpio, spi0(sck), spi1(sck), nand(we) +mpp10 10 gpio, dram(vttctrl), led(c1), nand(re) mpp11 11 gpio, dev(a0), led(c2), audio(sdo) mpp12 12 gpio, dev(a1), audio(bclk) mpp13 13 gpio, dev(readyn), pcie0(rstoutn), pcie1(rstoutn)
drivers/pinctrl/mvebu/pinctrl-armada-375.c +0 -2
@@ -98,13 +98,11 @@ static struct mvebu_mpp_mode mv88f6720_m MPP_FUNCTION(0x5, "nand", "ce")),MPP_MODE (9 ,MPP_FUNCTION (0x0 ,"gpio" ,NULL ), -MPP_FUNCTION (0x1 ,"nf" ,"wen" ),MPP_FUNCTION (0x2 ,"spi0" ,"sck" ),MPP_FUNCTION (0x3 ,"spi1" ,"sck" ),MPP_FUNCTION (0x5 ,"nand" ,"we" )), MPP_MODE(10, MPP_FUNCTION(0x0, "gpio", NULL), - MPP_FUNCTION(0x1, "nf", "ren"), MPP_FUNCTION(0x2, "dram", "vttctrl"), MPP_FUNCTION(0x3, "led", "c1"), MPP_FUNCTION(0x5, "nand", "re"),
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/pinctrl-mvebu-armada-xp-fix-functions-of-mpp48.patch queue-4.1/pinctrl-mvebu-armada-xp-remove-non-existing-nand-pins.patch queue-4.1/pinctrl-mvebu-armada-38x-fix-pcie-functions.patch queue-4.1/pinctrl-mvebu-armada-38x-fix-incorrect-total-number-of-gpios.patch queue-4.1/pinctrl-mvebu-armada-375-remove-incorrect-space-in-pin-description.patch queue-4.1/pinctrl-mvebu-armada-xp-remove-non-existing-vdd-cpu_pd-functions.patch queue-4.1/pinctrl-mvebu-armada-39x-fix-incorrect-total-number-of-gpios.patch queue-4.1/pinctrl-mvebu-armada-370-fix-spi0-pin-description.patch queue-4.1/pinctrl-mvebu-armada-375-remove-non-existing-nand-re-we-pins.patch