diff options
author | Fredrik Svensson <fredrik.xk.svensson@stericsson.com> | 2011-03-31 07:55:40 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2011-08-30 03:23:11 -0400 |
commit | 76525ec214449318f793ff05fa5b0ecd0afe41cd (patch) | |
tree | 2faa570e8cb713f61a9ad39c12b4ff89b9d63c65 /arch/arm/plat-nomadik | |
parent | 110c2c2f40647d31994c09f0afd1411e71f48a32 (diff) |
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 @@ | |||
37 | * SLPM value = same as normal | 37 | * SLPM value = same as normal |
38 | * | 38 | * |
39 | * PIN_CFG - default config with alternate function | 39 | * PIN_CFG - default config with alternate function |
40 | * PIN_CFG_PULL - default config with alternate function and pull up/down | ||
41 | */ | 40 | */ |
42 | 41 | ||
43 | typedef unsigned long pin_cfg_t; | 42 | typedef unsigned long pin_cfg_t; |
@@ -133,10 +132,6 @@ typedef unsigned long pin_cfg_t; | |||
133 | (PIN_CFG_DEFAULT |\ | 132 | (PIN_CFG_DEFAULT |\ |
134 | (PIN_NUM(num) | PIN_##alt | PIN_OUTPUT_##val)) | 133 | (PIN_NUM(num) | PIN_##alt | PIN_OUTPUT_##val)) |
135 | 134 | ||
136 | #define PIN_CFG_PULL(num, alt, pull) \ | ||
137 | ((PIN_CFG_DEFAULT & ~PIN_PULL_MASK) |\ | ||
138 | (PIN_NUM(num) | PIN_##alt | PIN_PULL_##pull)) | ||
139 | |||
140 | extern int nmk_config_pin(pin_cfg_t cfg, bool sleep); | 135 | extern int nmk_config_pin(pin_cfg_t cfg, bool sleep); |
141 | extern int nmk_config_pins(pin_cfg_t *cfgs, int num); | 136 | extern int nmk_config_pins(pin_cfg_t *cfgs, int num); |
142 | extern int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num); | 137 | extern int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num); |