diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2011-05-04 11:38:00 +0530 |
|---|---|---|
| committer | Henrik Aberg <henrik.aberg@stericsson.com> | 2011-05-18 09:40:15 +0200 |
| commit | e4536e1494836274547f6d28d8497f1a9e84ce60 (patch) | |
| tree | d5a0acd9889c8890ad802ba0075f20d77806b233 | |
| parent | fbf8e9fd10ae3bbedf588910dadb4a55a7e0bfff (diff) | |
u5500: move i2c to dynamic muxing
And remove the internal pullups. There are already external pullup resistors
on the board.
ST-Ericsson Linux next: -
ST-Ericsson ID: WP257121
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ibbb22a377575538f9d6de43cd97cb2a15d55da8e
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22358
Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-pins.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-pins.c b/arch/arm/mach-ux500/board-u5500-pins.c index 2167c48ca74..11b4a95f5cb 100644 --- a/arch/arm/mach-ux500/board-u5500-pins.c +++ b/arch/arm/mach-ux500/board-u5500-pins.c @@ -14,12 +14,6 @@ #include "pins.h" static pin_cfg_t u5500_pins_default[] = { - /* I2C */ - GPIO3_I2C1_SCL | PIN_INPUT_PULLUP, - GPIO4_I2C1_SDA | PIN_INPUT_PULLUP, - GPIO218_I2C2_SCL | PIN_INPUT_PULLUP, - GPIO219_I2C2_SDA | PIN_INPUT_PULLUP, - /* Keypad */ GPIO128_KP_I0 | PIN_INPUT_PULLUP, GPIO130_KP_I1 | PIN_INPUT_PULLUP, @@ -98,7 +92,23 @@ static pin_cfg_t u5500_pins_default[] = { GPIO204_LCD_VSI1 | PIN_INPUT_PULLUP, }; +static UX500_PINS(u5500_pins_i2c1, + GPIO3_I2C1_SCL, + GPIO4_I2C1_SDA, +); + +static UX500_PINS(u5500_pins_i2c2, + GPIO218_I2C2_SCL, + GPIO219_I2C2_SDA, +); + +static struct ux500_pin_lookup u5500_pins[] = { + PIN_LOOKUP("nmk-i2c.1", &u5500_pins_i2c1), + PIN_LOOKUP("nmk-i2c.2", &u5500_pins_i2c2), +}; + void __init u5500_pins_init(void) { nmk_config_pins(u5500_pins_default, ARRAY_SIZE(u5500_pins_default)); + ux500_pins_add(u5500_pins, ARRAY_SIZE(u5500_pins)); } |