summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Palatin <vpalatin@chromium.org>2013-06-07 12:05:28 -0700
committerChromeBot <chrome-bot@google.com>2013-06-09 13:19:06 -0700
commite738d7422eef063399854e6581c48a0ad2dbac59 (patch)
tree5961c09f4853e062aae18de876bb9fb76bed3b9c
parentfc91cccd1cb99b65f138bfa7099621b47dac0660 (diff)
downloadchrome-ec-e738d7422eef063399854e6581c48a0ad2dbac59.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: 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>
-rw-r--r--board/spring/board.c6
-rw-r--r--board/spring/board.h3
2 files changed, 4 insertions, 5 deletions
diff --git a/board/spring/board.c b/board/spring/board.c
index 117338d469..65ed854631 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -214,8 +214,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 4362bb7849..ee920d925a 100644
--- a/board/spring/board.h
+++ b/board/spring/board.h
@@ -37,9 +37,6 @@
/* Smart battery and TPSchrome are on a private I2C bus behind the EC */
#define CONFIG_I2C_PASSTHROUGH
-/* always enable the 3G modem power rail */
-#define CONFIG_PMU_FORCE_FET
-
#ifndef __ASSEMBLER__
/* By default, enable all console messages except keyboard */