summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Huang <david.huang@quanta.corp-partner.google.com>2019-04-22 11:42:42 +0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2019-04-22 15:09:46 +0000
commit87b3ac5691120e443be446fe7a17d899c8243a55 (patch)
treeedc553fb038f54ce29a3d9d8d94dfed24922522a
parenta6af0dc70895e708346549e3b5ef493f0b6d4de5 (diff)
downloadchrome-ec-87b3ac5691120e443be446fe7a17d899c8243a55.tar.gz
Octopus: support keyboard backlight for Droid/Blorb
Enable keyboard backlight control by PWM for Droid and Blorb. BUG=b:130330141 BRANCH=octopus TEST=Use console command "kblight 0-100" to check keyboard backlight works. Change-Id: I3b6ce8b622c5e90f6810ca4f50a4948b55fd61fa Signed-off-by: David Huang <David.Huang@quantatw.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1575349 Tested-by: Marco Chen <marcochen@chromium.org> Reviewed-by: Marco Chen <marcochen@chromium.org> (cherry picked from commit abb957d47b617134f983ce5543782c4324eca57b) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1577499 Commit-Queue: Marco Chen <marcochen@chromium.org>
-rw-r--r--board/bobba/board.c16
-rw-r--r--board/bobba/board.h6
2 files changed, 22 insertions, 0 deletions
diff --git a/board/bobba/board.c b/board/bobba/board.c
index 9e20943afe..eca68e19ca 100644
--- a/board/bobba/board.c
+++ b/board/bobba/board.c
@@ -292,6 +292,22 @@ static void cbi_init(void)
}
DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1);
+uint32_t board_override_feature_flags0(uint32_t flags0)
+{
+ /*
+ * Remove keyboard backlight feature for devices that don't support it.
+ */
+ if (sku_id == 33 || sku_id == 34 || sku_id == 41 || sku_id == 42)
+ return flags0;
+ else
+ return (flags0 & ~EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB));
+}
+
+uint32_t board_override_feature_flags1(uint32_t flags1)
+{
+ return flags1;
+}
+
void board_hibernate_late(void) {
int i;
diff --git a/board/bobba/board.h b/board/bobba/board.h
index b78864e3b3..3e1c40bfa7 100644
--- a/board/bobba/board.h
+++ b/board/bobba/board.h
@@ -22,6 +22,8 @@
#define CONFIG_LED_COMMON
+#define CONFIG_EC_FEATURE_BOARD_OVERRIDE
+
/* Sensors */
#define CONFIG_ACCEL_KX022 /* Lid accel */
#define CONFIG_ACCELGYRO_BMI160 /* Base accel */
@@ -49,6 +51,10 @@
#define CONFIG_STEINHART_HART_3V3_13K7_47K_4050B
#define CONFIG_STEINHART_HART_3V3_51K1_47K_4050B
+/* Keyboard backliht */
+#define CONFIG_PWM
+#define CONFIG_PWM_KBLIGHT
+
#ifndef __ASSEMBLER__
/* support factory keyboard test */