diff options
| author | Rejane Durand <rejane.durand@stericsson.com> | 2011-10-25 16:24:51 +0200 |
|---|---|---|
| committer | Rabin VINCENT <rabin.vincent@stericsson.com> | 2011-10-26 09:47:39 +0200 |
| commit | 725c3081c8056149c8cb7fcb6c2e58de75da8074 (patch) | |
| tree | dc81f3c1e191c0d55f38e39531328208e46f11e3 | |
| parent | 2efff037e37390f9685dc511176744795ed6f048 (diff) | |
[U9500] Correct the U9500 identification
With a u9500-100 software, "pins_for_u9500" as well as
"machine_is_hrefv60" returns true. So, if
"machine_is_hrefv60" is tested before "pins_for_u9500",
the u9500 specifics will never be applied.
ST-Ericsson ID: 369957
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I33aacae5948174187dff80a51692938d49184f80
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35238
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Rejane DURAND <rejane.durand@stericsson.com>
Tested-by: Rejane DURAND <rejane.durand@stericsson.com>
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 85ecfa15367..6241d490f2f 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -888,22 +888,22 @@ static void mop500_pins_suspend_force(void) sleep_pins_config_pm(mop500_pins_common_power_save_bank5, ARRAY_SIZE(mop500_pins_common_power_save_bank5)); - if (machine_is_hrefv60()) - sleep_pins_config_pm(mop500_pins_common_power_save_bank6_href60, - ARRAY_SIZE(mop500_pins_common_power_save_bank6_href60)); - else if (pins_for_u9500()) + if (pins_for_u9500()) sleep_pins_config_pm(mop500_pins_common_power_save_bank6_u9500, ARRAY_SIZE(mop500_pins_common_power_save_bank6_u9500)); + else if (machine_is_hrefv60()) + sleep_pins_config_pm(mop500_pins_common_power_save_bank6_href60, + ARRAY_SIZE(mop500_pins_common_power_save_bank6_href60)); else sleep_pins_config_pm(mop500_pins_common_power_save_bank6, ARRAY_SIZE(mop500_pins_common_power_save_bank6)); - if (machine_is_hrefv60()) - sleep_pins_config_pm(mop500_pins_common_power_save_bank7_href60, - ARRAY_SIZE(mop500_pins_common_power_save_bank7_href60)); - else if (pins_for_u9500()) + if (pins_for_u9500()) sleep_pins_config_pm(mop500_pins_common_power_save_bank7_u9500, ARRAY_SIZE(mop500_pins_common_power_save_bank7_u9500)); + else if (machine_is_hrefv60()) + sleep_pins_config_pm(mop500_pins_common_power_save_bank7_href60, + ARRAY_SIZE(mop500_pins_common_power_save_bank7_href60)); else sleep_pins_config_pm(mop500_pins_common_power_save_bank7, ARRAY_SIZE(mop500_pins_common_power_save_bank7)); |