diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-12-13 16:14:45 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-02-16 11:23:55 +0100 |
| commit | 611bd10d3c152dff0ff6615e64afcde9916a3be3 (patch) | |
| tree | 074da806b215a6a7ceb11362eeb6f3acce083a0a /arch/arm/mach-ux500/board-mop500-pins.c | |
| parent | 350b9733d167d46da862accbaf6bd792bb7d278f (diff) | |
mach-ux500: pins: Initialize u8500_pins before over pins
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-pins.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 83e1e911b95..f8e7cd74e3c 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -929,9 +929,6 @@ void __init mop500_pins_init(void) nmk_config_pins(mop500_pins_common, ARRAY_SIZE(mop500_pins_common)); - nmk_config_pins(mop500_pins_default, - ARRAY_SIZE(mop500_pins_default)); - ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins)); switch (pinsfor) { @@ -945,6 +942,9 @@ void __init mop500_pins_init(void) break; } + nmk_config_pins(mop500_pins_default, + ARRAY_SIZE(mop500_pins_default)); + suspend_set_pins_force_fn(mop500_pins_suspend_force, mop500_pins_suspend_force_mux); } @@ -956,6 +956,8 @@ void __init snowball_pins_init(void) ux500_pins_add(mop500_pins, ARRAY_SIZE(mop500_pins)); + nmk_config_pins(u8500_pins, ARRAY_SIZE(u8500_pins)); + nmk_config_pins(snowball_pins, ARRAY_SIZE(snowball_pins)); |