diff options
author | Vincent Palatin <vpalatin@chromium.org> | 2013-06-07 12:05:28 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-08-01 18:15:43 -0700 |
commit | 8f3d02ef7f325fddb83d84cdbfd50a83bb31082e (patch) | |
tree | 68e1e1b0a767386616896cee640893d591419259 | |
parent | bebfb9431ed973703df03c8e2da11cf280315272 (diff) | |
download | chrome-ec-8f3d02ef7f325fddb83d84cdbfd50a83bb31082e.tar.gz |
Revert "spring: always enable the PP3300_WWAN rail"
This reverts commit 154c73f32d2625d2cfbe2fa9be4e15b4f382a917.
The kernel driver to control TPS65090 FETs is now submitted in our tree,
and turning on the FET3 connected the 3G modem by default.
So let's remove the hardcoded to allow better power management policy on
the CPU side.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BRANCH=spring
BUG=chrome-os-partner:17790
TEST=on Spring, boot and dump the TPS65090 configuration from the EC
command line by using "pmu" command.
See 0x1f in the register 0x11 for FET3.
Change-Id: Ie699fef0348138a7483f0e8e7bcaebc37810eba8
Original-Change-Id: I9de0f92a561397ceb81a67b8291d1e8bf04ade38
Reviewed-on: https://gerrit.chromium.org/gerrit/57978
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/64271
Tested-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Vic Yang <victoryang@chromium.org>
-rw-r--r-- | board/spring/board.c | 6 | ||||
-rw-r--r-- | board/spring/board.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/board/spring/board.c b/board/spring/board.c index 40b6610113..fa156d0ae4 100644 --- a/board/spring/board.c +++ b/board/spring/board.c @@ -197,8 +197,10 @@ static void board_startup_hook(void) gpio_set_flags(GPIO_SUSPEND_L, INT_BOTH_PULL_UP); #ifdef CONFIG_PMU_FORCE_FET - /* Enable 3G modem power */ - pmu_enable_fet(FET_WWAN, 1, NULL); + /* Enable lcd panel power */ + pmu_enable_fet(FET_LCD_PANEL, 1, NULL); + /* Enable backlight power */ + pmu_enable_fet(FET_BACKLIGHT, 1, NULL); #endif /* CONFIG_PMU_FORCE_FET */ } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_startup_hook, HOOK_PRIO_DEFAULT); diff --git a/board/spring/board.h b/board/spring/board.h index 2990a316a4..be9971f85e 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -32,7 +32,6 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_LOW_POWER_IDLE /* Use STOP mode when we have nothing to do */ #define CONFIG_LED_DRIVER_LP5562 -#define CONFIG_PMU_FORCE_FET /* Always enable 3G modem power rail */ #define CONFIG_PMU_HARD_RESET #define CONFIG_PMU_TPS65090 #define CONFIG_USB_SWITCH_TSU6721 |