summaryrefslogtreecommitdiff
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorRikard Olsson <rikard.p.olsson@stericsson.com>2011-04-20 18:10:01 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:58 +0200
commiteea9915f9c78a6488962a2389a5d35cfcde2ff9d (patch)
treefde6383a80a584019121ef1f8fbde0c267436feb /arch/arm/plat-nomadik
parentea4a725ffbcba72691e1f39184ebf7ac34301224 (diff)
mach-ux500: GPIO power settings in suspend
This patch will become obsolete when all drivers uses pm_runtime to control their GPIO sleep settings. ST-Ericsson Linux next: - ST-Ericsson ID:334251 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ibb656d55e20087202aae99b098aad5cf3fb21dcc Signed-off-by: Rikard Olsson <rikard.p.olsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21279 Reviewed-by: QATEST Reviewed-by: Rickard ANDERSSON <rickard.andersson@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/plat-nomadik')
-rw-r--r--arch/arm/plat-nomadik/include/plat/pincfg.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/pincfg.h b/arch/arm/plat-nomadik/include/plat/pincfg.h
index e1bc46b274e..b054a48d528 100644
--- a/arch/arm/plat-nomadik/include/plat/pincfg.h
+++ b/arch/arm/plat-nomadik/include/plat/pincfg.h
@@ -24,6 +24,7 @@
* bit 16..18 - SLPM pull up/down state
* bit 19..20 - SLPM direction
* bit 21..22 - SLPM Value (if output)
+ * bit 23..25 - PDIS value (if input)
*
* to facilitate the definition, the following macros are provided
*
@@ -106,6 +107,14 @@ typedef unsigned long pin_cfg_t;
#define PIN_SLPM_VAL_LOW ((1 + 0) << PIN_SLPM_VAL_SHIFT)
#define PIN_SLPM_VAL_HIGH ((1 + 1) << PIN_SLPM_VAL_SHIFT)
+#define PIN_SLPM_PDIS_SHIFT 23
+#define PIN_SLPM_PDIS_MASK (0x3 << PIN_SLPM_PDIS_SHIFT)
+#define PIN_SLPM_PDIS(x) \
+ (((x) & PIN_SLPM_PDIS_MASK) >> PIN_SLPM_PDIS_SHIFT)
+#define PIN_SLPM_PDIS_NO_CHANGE (0 << PIN_SLPM_PDIS_SHIFT)
+#define PIN_SLPM_PDIS_DISABLED (1 << PIN_SLPM_PDIS_SHIFT)
+#define PIN_SLPM_PDIS_ENABLED (2 << PIN_SLPM_PDIS_SHIFT)
+
/* Shortcuts. Use these instead of separate DIR, PULL, and VAL. */
#define PIN_INPUT_PULLDOWN (PIN_DIR_INPUT | PIN_PULL_DOWN)
#define PIN_INPUT_PULLUP (PIN_DIR_INPUT | PIN_PULL_UP)