lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 16/89] pinctrl: mvebu: armada-xp: remove non-existing NAND pins
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

    commit bc99357f3690c11817756adfee0ece811a3db2e7 upstream.

    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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Fixes: 463e270f766a ("pinctrl: mvebu: add pinctrl driver for Armada XP")
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 4 ++--
    drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 2 --
    2 files changed, 2 insertions(+), 4 deletions(-)

    --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
    +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
    @@ -41,8 +41,8 @@ mpp20 20 gpio, ge0(rxd4),
    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)
    --- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
    +++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
    @@ -159,13 +159,11 @@ static struct mvebu_mpp_mode armada_xp_m
    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,



    \
     
     \ /
      Last update: 2015-07-31 22:41    [W:4.037 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site