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 18/89] pinctrl: mvebu: armada-xp: fix functions of MPP48
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit ea78b9511a54d0de026e04b5da86b30515072f31 upstream.

    There was a mistake in the definition of the functions for MPP48 on
    Marvell Armada XP. The second function is dev(clkout), and not tclk.

    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 | 2 +-
    drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
    +++ b/Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt
    @@ -68,7 +68,7 @@ mpp45 45 gpio, uart2(rts),
    mpp46 46 gpio, uart3(rts), uart1(rts), spi(cs6), sata0(prsnt)
    mpp47 47 gpio, uart3(cts), uart1(cts), spi(cs7), pcie(clkreq3),
    ref(clkout)
    -mpp48 48 gpio, tclk, dev(burst/last)
    +mpp48 48 gpio, dev(clkout), dev(burst/last)

    * Marvell Armada XP (mv78260 and mv78460 only)

    --- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
    +++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
    @@ -274,7 +274,7 @@ static struct mvebu_mpp_mode armada_xp_m
    MPP_VAR_FUNCTION(0x5, "pcie", "clkreq3", V_MV78230_PLUS)),
    MPP_MODE(48,
    MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78230_PLUS),
    - MPP_VAR_FUNCTION(0x1, "tclk", NULL, V_MV78230_PLUS),
    + MPP_VAR_FUNCTION(0x1, "dev", "clkout", V_MV78230_PLUS),
    MPP_VAR_FUNCTION(0x2, "dev", "burst/last", V_MV78230_PLUS)),
    MPP_MODE(49,
    MPP_VAR_FUNCTION(0x0, "gpio", NULL, V_MV78260_PLUS),



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