summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/lazor/board.c10
-rw-r--r--board/trogdor/board.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/board/lazor/board.c b/board/lazor/board.c
index fcec96169e..76739e7380 100644
--- a/board/lazor/board.c
+++ b/board/lazor/board.c
@@ -236,6 +236,9 @@ static void board_init(void)
* the CCD_MODE_ODL interrupt to make sure the SBU FETs are connected.
*/
gpio_enable_interrupt(GPIO_CCD_MODE_ODL);
+
+ /* Set the backlight duty cycle to 0. AP will override it later. */
+ pwm_set_duty(PWM_CH_DISPLIGHT, 0);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
@@ -272,9 +275,6 @@ static void board_chipset_suspend(void)
*/
gpio_set_level(GPIO_ENABLE_BACKLIGHT, 0);
pwm_enable(PWM_CH_DISPLIGHT, 0);
-
- /* Disable the keyboard backlight */
- pwm_enable(PWM_CH_KBLIGHT, 0);
}
DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
@@ -283,8 +283,8 @@ static void board_chipset_resume(void)
{
/* Turn on display and keyboard backlight in S0. */
gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1);
- pwm_enable(PWM_CH_DISPLIGHT, 1);
- pwm_enable(PWM_CH_KBLIGHT, 1);
+ if (pwm_get_duty(PWM_CH_DISPLIGHT))
+ pwm_enable(PWM_CH_DISPLIGHT, 1);
}
DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT);
diff --git a/board/trogdor/board.c b/board/trogdor/board.c
index 4ada5e7945..00c8e3c024 100644
--- a/board/trogdor/board.c
+++ b/board/trogdor/board.c
@@ -250,6 +250,9 @@ static void board_init(void)
* the CCD_MODE_ODL interrupt to make sure the SBU FETs are connected.
*/
gpio_enable_interrupt(GPIO_CCD_MODE_ODL);
+
+ /* Set the backlight duty cycle to 0. AP will override it later. */
+ pwm_set_duty(PWM_CH_DISPLIGHT, 0);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
@@ -286,9 +289,6 @@ static void board_chipset_suspend(void)
*/
gpio_set_level(GPIO_ENABLE_BACKLIGHT, 0);
pwm_enable(PWM_CH_DISPLIGHT, 0);
-
- /* Disable the keyboard backlight */
- pwm_enable(PWM_CH_KBLIGHT, 0);
}
DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
@@ -297,8 +297,8 @@ static void board_chipset_resume(void)
{
/* Turn on display and keyboard backlight in S0. */
gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1);
- pwm_enable(PWM_CH_DISPLIGHT, 1);
- pwm_enable(PWM_CH_KBLIGHT, 1);
+ if (pwm_get_duty(PWM_CH_DISPLIGHT))
+ pwm_enable(PWM_CH_DISPLIGHT, 1);
}
DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT);