From 4925508662bc01cd43579e900967271c74a23dbc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Aug 2014 21:54:03 -0700 Subject: [PATCH] 3.14-stable patches added patches: pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch --- ...-dt-bindings-fix-pull-enable-disable.patch | 58 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 queue-3.14/pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch diff --git a/queue-3.14/pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch b/queue-3.14/pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch new file mode 100644 index 00000000000..25f3401ca12 --- /dev/null +++ b/queue-3.14/pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch @@ -0,0 +1,58 @@ +From 23d9cec07c589276561c13b180577c0b87930140 Mon Sep 17 00:00:00 2001 +From: Nishanth Menon +Date: Tue, 22 Jul 2014 10:39:54 -0500 +Subject: pinctrl: dra: dt-bindings: Fix pull enable/disable + +From: Nishanth Menon + +commit 23d9cec07c589276561c13b180577c0b87930140 upstream. + +The DRA74/72 control module pins have a weak pull up and pull down. +This is configured by bit offset 17. if BIT(17) is 1, a pull up is +selected, else a pull down is selected. + +However, this pull resisstor is applied based on BIT(16) - +PULLUDENABLE - if BIT(18) is *0*, then pull as defined in BIT(17) is +applied, else no weak pulls are applied. We defined this in reverse. + +Reference: Table 18-5 (Description of the pad configuration register +bits) in Technical Reference Manual Revision (DRA74x revision Q: +SPRUHI2Q Revised June 2014 and DRA72x revision F: SPRUHP2F - Revised +June 2014) + +Fixes: 6e58b8f1daaf1a ("ARM: dts: DRA7: Add the dts files for dra7 SoC and dra7-evm board") +Signed-off-by: Nishanth Menon +Tested-by: Felipe Balbi +Acked-by: Felipe Balbi +Signed-off-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman + +--- + include/dt-bindings/pinctrl/dra.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/include/dt-bindings/pinctrl/dra.h ++++ b/include/dt-bindings/pinctrl/dra.h +@@ -30,7 +30,8 @@ + #define MUX_MODE14 0xe + #define MUX_MODE15 0xf + +-#define PULL_ENA (1 << 16) ++#define PULL_ENA (0 << 16) ++#define PULL_DIS (1 << 16) + #define PULL_UP (1 << 17) + #define INPUT_EN (1 << 18) + #define SLEWCONTROL (1 << 19) +@@ -38,10 +39,10 @@ + #define WAKEUP_EVENT (1 << 25) + + /* Active pin states */ +-#define PIN_OUTPUT 0 ++#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_INPUT INPUT_EN ++#define PIN_INPUT (INPUT_EN | PULL_DIS) + #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL) + #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP) + #define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN) diff --git a/queue-3.14/series b/queue-3.14/series index 7afc8081d19..1c85cd3809d 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -27,3 +27,4 @@ x86-espfix-fix-broken-header-guard.patch x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch x86-espfix-make-it-possible-to-disable-16-bit-support.patch x86_64-entry-xen-do-not-invoke-espfix64-on-xen.patch +pinctrl-dra-dt-bindings-fix-pull-enable-disable.patch -- 2.47.3