summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/grunt/board.c14
-rw-r--r--board/grunt/gpio.inc2
-rw-r--r--board/kahlee/board.c14
-rw-r--r--power/stoney.c4
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);