| Message ID | 1415009392-6627-1-git-send-email-rogerq@ti.com |
|---|---|
| State | Accepted |
| Commit | 73b3a6657a88ef5348a0d69c9a8107d6f01ae862 |
| Headers | show |
On 11/03/2014 04:09 AM, Roger Quadros wrote: > 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> > --- > include/dt-bindings/pinctrl/dra.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h > index 3d33794..7448edf 100644 > --- 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) > There might be additional updates needed to DRA7 pinctrl sequencing requirements based on latest documentation: http://www.ti.com/lit/ug/spruhz6/spruhz6.pdf#page=4004&zoom=auto,0,274.1 But, that has nothing to do with the bug that is currently being fixed in this patch,. So, for the record: Acked-by: Nishanth Menon <nm@ti.com>
* Nishanth Menon <nm@ti.com> [141105 09:12]: > On 11/03/2014 04:09 AM, Roger Quadros wrote: > > 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> > > --- > > include/dt-bindings/pinctrl/dra.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h > > index 3d33794..7448edf 100644 > > --- 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) > > > > > There might be additional updates needed to DRA7 pinctrl sequencing > requirements based on latest documentation: > > http://www.ti.com/lit/ug/spruhz6/spruhz6.pdf#page=4004&zoom=auto,0,274.1 > > But, that has nothing to do with the bug that is currently being fixed > in this patch,. > > So, for the record: > Acked-by: Nishanth Menon <nm@ti.com> OK applying into omap-for-v3.18/fixes thanks. Tony -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h index 3d33794..7448edf 100644 --- 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)
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> --- include/dt-bindings/pinctrl/dra.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)