diff options
| author | Fredrik Svensson <fredrik.xk.svensson@stericsson.com> | 2011-03-31 13:55:40 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2011-08-30 09:23:11 +0200 |
| commit | 76525ec214449318f793ff05fa5b0ecd0afe41cd (patch) | |
| tree | 2faa570e8cb713f61a9ad39c12b4ff89b9d63c65 /arch/arm/plat-nomadik | |
| parent | mach-ux500: remove most of the ugly machine_is_*() calls (diff) | |
| download | linux-76525ec214449318f793ff05fa5b0ecd0afe41cd.tar.xz linux-76525ec214449318f793ff05fa5b0ecd0afe41cd.zip | |
mach-ux500: remove pull-pinconfig and add SPI2
Remove PIN_CFG_PULL in pincfg.h for plat-nomadik, PIN_CFG_INPUT
already takes care of this. Added support for SPI2.
Signed-off-by: Fredrik Svensson <fredrik.xk.svensson@stericsson.com>
Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
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); |