summaryrefslogtreecommitdiff
path: root/common/acpi.c
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2019-04-02 10:34:54 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-04 23:09:25 -0700
commited230bf3f5ab05a2e09d4eb88d66cff4b3a856b2 (patch)
tree2313c66a26e546e9457ea54c180517357b9a69c0 /common/acpi.c
parentf4d798a1ee801abc0f8cfdd2f1a1115b9050f7f0 (diff)
downloadchrome-ec-ed230bf3f5ab05a2e09d4eb88d66cff4b3a856b2.tar.gz
kblight: Remove dependency on PWM
Keyboard backlight can be controlled either by PWM or an external controller. This patch decouples keyboard backlight common code and PWM based backlight control. Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=none BRANCH=Nami TEST=Verify keyboard backlight can be adjusted on Ekko. Change-Id: I332b01a2a2b15bd37ce385b6c30591c90f078dfc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1549476 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> (cherry picked from commit e879713cee3212b4afffb3f0dd3c4dfbf8237c4a) Reviewed-on: https://chromium-review.googlesource.com/1549606 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'common/acpi.c')
-rw-r--r--common/acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/acpi.c b/common/acpi.c
index e33ac17bb0..e681fd25a6 100644
--- a/common/acpi.c
+++ b/common/acpi.c
@@ -195,7 +195,7 @@ int acpi_ap_to_ec(int is_cmd, uint8_t value, uint8_t *resultptr)
case EC_ACPI_MEM_TEST_COMPLIMENT:
result = 0xff - acpi_mem_test;
break;
-#ifdef CONFIG_PWM_KBLIGHT
+#ifdef CONFIG_KEYBOARD_BACKLIGHT
case EC_ACPI_MEM_KEYBOARD_BACKLIGHT:
result = kblight_get();
break;
@@ -301,7 +301,7 @@ int acpi_ap_to_ec(int is_cmd, uint8_t value, uint8_t *resultptr)
battery_memmap_set_index(data);
break;
#endif
-#ifdef CONFIG_PWM_KBLIGHT
+#ifdef CONFIG_KEYBOARD_BACKLIGHT
case EC_ACPI_MEM_KEYBOARD_BACKLIGHT:
/*
* Debug output with CR not newline, because the host