aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik/include/plat/pincfg.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 06:06:09 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 06:06:09 +0200
commit499ba610c2829adafbf393c2f3773d73ae4445f3 (patch)
treefae89854e0b3e704dd6410780e392901df1a6759 /arch/arm/plat-nomadik/include/plat/pincfg.h
parent817ba283acf2d7b5aa073b96fd989f336fcff72a (diff)
downloadkernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.zip
kernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.tar.gz
kernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.tar.bz2
merge more graphics stuff from 3.2.72
Diffstat (limited to 'arch/arm/plat-nomadik/include/plat/pincfg.h')
-rw-r--r--arch/arm/plat-nomadik/include/plat/pincfg.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/pincfg.h b/arch/arm/plat-nomadik/include/plat/pincfg.h
index 05a3936..22cb97d 100644
--- a/arch/arm/plat-nomadik/include/plat/pincfg.h
+++ b/arch/arm/plat-nomadik/include/plat/pincfg.h
@@ -37,7 +37,6 @@
* SLPM value = same as normal
*
* PIN_CFG - default config with alternate function
- * PIN_CFG_PULL - default config with alternate function and pull up/down
*/
typedef unsigned long pin_cfg_t;
@@ -133,10 +132,6 @@ typedef unsigned long pin_cfg_t;
(PIN_CFG_DEFAULT |\
(PIN_NUM(num) | PIN_##alt | PIN_OUTPUT_##val))
-#define PIN_CFG_PULL(num, alt, pull) \
- ((PIN_CFG_DEFAULT & ~PIN_PULL_MASK) |\
- (PIN_NUM(num) | PIN_##alt | PIN_PULL_##pull))
-
extern int nmk_config_pin(pin_cfg_t cfg, bool sleep);
extern int nmk_config_pins(pin_cfg_t *cfgs, int num);
extern int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num);