summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2015-11-30 15:30:25 -0800
committerchrome-bot <chrome-bot@chromium.org>2015-12-01 22:37:00 -0800
commit0e9cd956647cca2940d67e2ef1b6e0c35cedd145 (patch)
treefa002d504dc132ecc4e32433653c114515b34146
parentc9e0e4d5789992902844c31805f1cb4553b557a1 (diff)
downloadchrome-ec-0e9cd956647cca2940d67e2ef1b6e0c35cedd145.tar.gz
chell: Keep keyboard backlight off in hibernate
If pulled up the backlight will be at 100% brightness instead of off. BUG=chrome-os-partner:48130 BRANCH=none TEST=hibernate on chell, see keyboard backlight stay off Change-Id: I30cd289b9492356407aa54e6a84b04add647bd9a Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/314936 Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--board/chell/board.c4
-rw-r--r--board/chell/gpio.inc1
2 files changed, 4 insertions, 1 deletions
diff --git a/board/chell/board.c b/board/chell/board.c
index 6c31a05dc8..c3f7c85c3d 100644
--- a/board/chell/board.c
+++ b/board/chell/board.c
@@ -365,9 +365,11 @@ uint32_t board_get_gpio_hibernate_state(uint32_t port, uint32_t pin)
GPIO_TO_PORT_MASK_PAIR(GPIO_PMIC_LDO_EN),
/* The GPIO to control RTCRST is active high. */
GPIO_TO_PORT_MASK_PAIR(GPIO_PCH_RTCRST),
+ /* Keep keyboard backlight off, GPIO34 pin is in PWM mode */
+ GPIO_TO_PORT_MASK_PAIR(GPIO_KEYBOARD_BACKLIGHT),
};
- /* LED GPIOs should be driven low to turn off LEDs */
+ /* Some GPIOs should be driven low in hibernate */
for (i = 0; i < ARRAY_SIZE(out_low_gpios); ++i)
if (out_low_gpios[i][0] == port && out_low_gpios[i][1] == pin)
return GPIO_OUTPUT | GPIO_LOW;
diff --git a/board/chell/gpio.inc b/board/chell/gpio.inc
index 9b579ae17e..6aab9278f6 100644
--- a/board/chell/gpio.inc
+++ b/board/chell/gpio.inc
@@ -89,6 +89,7 @@ GPIO(BOARD_VERSION2, PIN(7), GPIO_INPUT)
GPIO(BOARD_VERSION3, PIN(10), GPIO_INPUT)
GPIO(KBD_KSO2, PIN(101), GPIO_KB_OUTPUT_COL2)
GPIO(PVT_CS0, PIN(146), GPIO_ODR_HIGH)
+GPIO(KEYBOARD_BACKLIGHT, PIN(34), GPIO_OUT_LOW)
/*
* TODO(crosbug.com/p/40848): These LEDs should be under control of the mec1322