From 76525ec214449318f793ff05fa5b0ecd0afe41cd Mon Sep 17 00:00:00 2001 From: Fredrik Svensson Date: Thu, 31 Mar 2011 13:55:40 +0200 Subject: 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 Signed-off-by: Daniel Willerud Signed-off-by: Linus Walleij --- arch/arm/plat-nomadik/include/plat/pincfg.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch/arm/plat-nomadik') 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); -- cgit v1.1