diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
| commit | eed1e576507b52e03e549e0c9e0c747978122403 (patch) | |
| tree | 69a7ecac041f83b0299f55a760f4f0cd5767ae05 /arch/arm/plat-nomadik | |
| parent | 65af7c4608f7b7019e2faa220fb9624988965873 (diff) | |
| parent | 76525ec214449318f793ff05fa5b0ecd0afe41cd (diff) | |
| download | talos-op-linux-eed1e576507b52e03e549e0c9e0c747978122403.tar.gz talos-op-linux-eed1e576507b52e03e549e0c9e0c747978122403.zip | |
Merge branch 'stericsson/cleanup' into next/timer
The timer and cleanup branches from stericsson conflict,
so I'm merging them here.
Conflicts:
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-nomadik')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/pincfg.h | 5 |
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 05a3936ae6d1..22cb97d2d8ad 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); |
