From 9ab5ffaef0b98e797ee6d1e09687c1fa7b4b79fe Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Tue, 12 Apr 2016 14:01:48 -0700 Subject: [PATCH] kevin: Remove KBLIGHT module Rename KBLIGHT to BKLIGHT (and remove the unneeded CONFIG) to reflect the actual PWM function. BUG=None BRANCH=None TEST=`make buildall -j` and verify kevin boots to kernel Change-Id: Idf6d21f096e491a62862362862e1e8a481db8987 Signed-off-by: Shawn Nematbakhsh Reviewed-on: https://chromium-review.googlesource.com/338512 Commit-Ready: Shawn N Tested-by: Shawn N Reviewed-by: Mary Ruthven --- board/kevin/board.c | 2 +- board/kevin/board.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/board/kevin/board.c b/board/kevin/board.c index d49eafa7e0..8c61aff0f1 100644 --- a/board/kevin/board.c +++ b/board/kevin/board.c @@ -66,7 +66,7 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /******************************************************************************/ /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { 2, 0, 10000 }, + [PWM_CH_BKLIGHT] = { 2, 0, 10000 }, [PWM_CH_LED] = { 3, PWM_CONFIG_DSLEEP_CLK, 100 }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); diff --git a/board/kevin/board.h b/board/kevin/board.h index 4828aed902..f70617af77 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -25,7 +25,6 @@ #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_MKBP /* Instead of 8042 protocol of keyboard */ #define CONFIG_POWER_BUTTON -#define CONFIG_PWM_KBLIGHT /* TODO: Verify W25Q40 protect regs are compatible with W25X40 */ #define CONFIG_SPI_FLASH_W25X40 #define CONFIG_VBOOT_HASH @@ -110,7 +109,7 @@ enum adc_channel { }; enum pwm_channel { - PWM_CH_KBLIGHT, + PWM_CH_BKLIGHT, PWM_CH_LED, /* Number of PWM channels */ PWM_CH_COUNT