diff options
| author | Edward Hill <ecgh@chromium.org> | 2018-01-12 11:17:22 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-14 18:38:27 -0800 |
| commit | 66bc9c1082771e4da720f93e64aadfae23c1f22e (patch) | |
| tree | 277814779f5fa7d7d7e9624347e486f3136bca28 | |
| parent | ad59381ca31fb4728a1da24e28c3b17cf8468dc6 (diff) | |
| download | chrome-ec-66bc9c1082771e4da720f93e64aadfae23c1f22e.tar.gz | |
grunt: Fix ENABLE_BACKLIGHT to be active low
BUG=b:71806495
BRANCH=none
TEST=backlight turns on in S0
Change-Id: Ib9271d6cbe9befdf4ed492a9c2b676452e5f4d9b
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/865155
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
| -rw-r--r-- | board/grunt/board.c | 14 | ||||
| -rw-r--r-- | board/grunt/gpio.inc | 2 | ||||
| -rw-r--r-- | board/kahlee/board.c | 14 | ||||
| -rw-r--r-- | power/stoney.c | 4 |
4 files changed, 29 insertions, 5 deletions
diff --git a/board/grunt/board.c b/board/grunt/board.c index a485c70ca0..fa560cb265 100644 --- a/board/grunt/board.c +++ b/board/grunt/board.c @@ -203,6 +203,20 @@ static void board_init(void) } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); +static void board_chipset_resume(void) +{ + /* Turn on display backlight (active low GPIO). */ + gpio_set_level(GPIO_ENABLE_BACKLIGHT_L, 0); +} +DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); + +static void board_chipset_suspend(void) +{ + /* Turn off display backlight (active low GPIO). */ + gpio_set_level(GPIO_ENABLE_BACKLIGHT_L, 1); +} +DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); + /** * Power on (or off) a single TCPC. * minimum on/off delays are included. diff --git a/board/grunt/gpio.inc b/board/grunt/gpio.inc index 4ad84713bb..ab24ffbdc4 100644 --- a/board/grunt/gpio.inc +++ b/board/grunt/gpio.inc @@ -25,7 +25,7 @@ GPIO_INT(6AXIS_INT_L, PIN(8, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi160_inter GPIO(EN_PWR_A, PIN(E, 2), GPIO_OUT_HIGH) /* Enable Power */ GPIO(EN_PP1800_SENSOR, PIN(6, 7), GPIO_OUT_HIGH) /* Enable Power */ -GPIO(ENABLE_BACKLIGHT, PIN(D, 3), GPIO_OUT_LOW) /* Enable Backlight */ +GPIO(ENABLE_BACKLIGHT_L, PIN(D, 3), GPIO_OUT_HIGH) /* Enable Backlight */ GPIO(PCH_RSMRST_L, PIN(C, 2), GPIO_OUT_LOW) /* RSMRST# to SOC */ GPIO(PCH_PWRBTN_L, PIN(C, 1), GPIO_OUT_HIGH) /* Power Button to SOC */ GPIO(PCH_WAKE_L, PIN(7, 4), GPIO_OUT_HIGH) /* Wake SOC */ diff --git a/board/kahlee/board.c b/board/kahlee/board.c index 159063aa51..1369dce43e 100644 --- a/board/kahlee/board.c +++ b/board/kahlee/board.c @@ -445,6 +445,20 @@ static void board_chipset_shutdown(void) } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); +static void board_chipset_resume(void) +{ + /* Turn on display backlight. */ + gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1); +} +DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); + +static void board_chipset_suspend(void) +{ + /* Turn off display backlight. */ + gpio_set_level(GPIO_ENABLE_BACKLIGHT, 0); +} +DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); + void chipset_do_shutdown(void) { diff --git a/power/stoney.c b/power/stoney.c index 5e131e71e4..911ebe3b09 100644 --- a/power/stoney.c +++ b/power/stoney.c @@ -192,8 +192,6 @@ enum power_state _power_handle_state(enum power_state state) return POWER_S3S5; } - gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1); - /* Enable wireless */ wireless_set_state(WIRELESS_ON); @@ -222,8 +220,6 @@ enum power_state _power_handle_state(enum power_state state) /* Call hooks before we remove power rails */ hook_notify(HOOK_CHIPSET_SUSPEND); - gpio_set_level(GPIO_ENABLE_BACKLIGHT, 0); - /* Suspend wireless */ wireless_set_state(WIRELESS_SUSPEND); |