summaryrefslogtreecommitdiff
path: root/board/atlas
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2019-04-12 19:27:14 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-26 09:09:01 -0700
commitc3ecd60e5f12c344baa6caa4b51b19f00c7e8adf (patch)
treea2cc226fbeedf05b70a3d4ef45558f9aa4518050 /board/atlas
parente941ef3c409a000bbd4a388166cdd80ef71211c2 (diff)
downloadchrome-ec-c3ecd60e5f12c344baa6caa4b51b19f00c7e8adf.tar.gz
atlas: let AP fully control display backlight
this change removes the EC from the display backlight control logic. previously, the EC would enable/disable the backlight master enable directly based on the lid switch. this turns out to be redundant and in some cases causes timing violations between backlight enable and the backlight PWM signal. the AP already controls the display power load switch (EN_PP3300_DX_EDP), so when the AP is off, display power (including the backlight) is also off. in addition, the AP correctly controls the backlight using PCH_EDP_BKLTEN. with this change, we're only removing the EC's master kill switch for the backlight. BRANCH=none BUG=b:129651119,b:128625720 TEST=verified no ill effects on atlas. EE scoped PWM vs. BL enable. Change-Id: Ibef9062ce66dfec1363626e674f144a1a3d55b5e Signed-off-by: Caveh Jalali <caveh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1566482 Commit-Queue: Caveh Jalali <caveh@google.com> Tested-by: Caveh Jalali <caveh@google.com> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> (cherry picked from commit e3c9e42a6475121e07fc5b9372e24af847fecf4b) Reviewed-on: https://chromium-review.googlesource.com/1585134 Commit-Ready: Caveh Jalali <caveh@google.com> Reviewed-by: Caveh Jalali <caveh@google.com>
Diffstat (limited to 'board/atlas')
-rw-r--r--board/atlas/board.c2
-rw-r--r--board/atlas/board.h2
-rw-r--r--board/atlas/gpio.inc2
3 files changed, 1 insertions, 5 deletions
diff --git a/board/atlas/board.c b/board/atlas/board.c
index fd38f1cee2..e0350cfd80 100644
--- a/board/atlas/board.c
+++ b/board/atlas/board.c
@@ -545,14 +545,12 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
static void board_chipset_suspend(void)
{
- gpio_set_level(GPIO_ENABLE_BACKLIGHT, 0);
gpio_set_level(GPIO_KBD_BL_EN, 0);
}
DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
static void board_chipset_resume(void)
{
- gpio_set_level(GPIO_ENABLE_BACKLIGHT, 1);
gpio_set_level(GPIO_KBD_BL_EN, 1);
}
DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT);
diff --git a/board/atlas/board.h b/board/atlas/board.h
index 63f5e5be93..d4e1ac2c46 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -18,7 +18,6 @@
/* EC */
#define CONFIG_ADC
-#define CONFIG_BACKLIGHT_LID
#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BOARD_FORCE_RESET_PIN
#define CONFIG_DPTF
@@ -258,7 +257,6 @@ void board_reset_pd_mcu(void);
#define GPIO_BOARD_VERSION2 GPIO_EC_BRD_ID2
#define GPIO_BOARD_VERSION3 GPIO_EC_BRD_ID3
#define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL
-#define GPIO_ENABLE_BACKLIGHT GPIO_EC_BL_DISABLE_L
#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW
#define GPIO_KBD_KSO2 GPIO_EC_KB_ROW02_INV
#define GPIO_PCH_ACOK GPIO_EC_PCH_ACPRESENT
diff --git a/board/atlas/gpio.inc b/board/atlas/gpio.inc
index 2846ba22b0..043e7e4506 100644
--- a/board/atlas/gpio.inc
+++ b/board/atlas/gpio.inc
@@ -60,7 +60,7 @@ GPIO(USB_PD_RST_L, PIN(F, 1), GPIO_OUT_LOW) /* C0,C1 PD Reset */
GPIO(CCD_MODE_ODL, PIN(E, 3), GPIO_INPUT) /* Case Closed Debug Mode */
GPIO(EC_BATT_PRES_L, PIN(E, 5), GPIO_INPUT) /* Battery Present */
GPIO(EC_ENTERING_RW, PIN(E, 1), GPIO_OUTPUT) /* EC Entering RW */
-GPIO(EC_BL_DISABLE_L, PIN(D, 3), GPIO_ODR_LOW) /* Enable Backlight */
+GPIO(EC_BL_DISABLE_L, PIN(D, 3), GPIO_INPUT) /* Enable Backlight */
GPIO(EC_BRD_ID1, PIN(9, 6), GPIO_INPUT) /* Board ID bit0 */
GPIO(EC_BRD_ID2, PIN(9, 3), GPIO_INPUT) /* Board ID bit1 */
GPIO(EC_BRD_ID3, PIN(F, 0), GPIO_INPUT) /* Board ID bit2 */