lkml.org 
[lkml]   [2014]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 043/122] pinctrl: dra: dt-bindings: Fix output pull up/down
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Roger Quadros <rogerq@ti.com>

    commit 73b3a6657a88ef5348a0d69c9a8107d6f01ae862 upstream.

    For PIN_OUTPUT_PULLUP and PIN_OUTPUT_PULLDOWN we must not set the
    PULL_DIS bit which disables the PULLs.

    PULL_ENA is a 0 and using it in an OR operation is a NOP, so don't
    use it in the PIN_OUTPUT_PULLUP/DOWN macros.

    Fixes: 23d9cec07c58 ("pinctrl: dra: dt-bindings: Fix pull enable/disable")

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    Acked-by: Nishanth Menon <nm@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/dt-bindings/pinctrl/dra.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/dt-bindings/pinctrl/dra.h
    +++ b/include/dt-bindings/pinctrl/dra.h
    @@ -40,8 +40,8 @@

    /* Active pin states */
    #define PIN_OUTPUT (0 | PULL_DIS)
    -#define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)
    -#define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA)
    +#define PIN_OUTPUT_PULLUP (PULL_UP)
    +#define PIN_OUTPUT_PULLDOWN (0)
    #define PIN_INPUT (INPUT_EN | PULL_DIS)
    #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)
    #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)



    \
     
     \ /
      Last update: 2014-11-19 22:41    [W:4.085 / U:0.888 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site