diff options
| author | Wai-Hong Tam <waihong@google.com> | 2020-09-14 17:04:40 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-17 01:47:11 +0000 |
| commit | d4829c42658a23c380eeacf218f26d6765bbad53 (patch) | |
| tree | 964520420f9a0d08a9cdbc5d7007e475ac6c3b42 | |
| parent | f5015952e627fc7f40d5258065b17fbe1834f956 (diff) | |
| download | chrome-ec-d4829c42658a23c380eeacf218f26d6765bbad53.tar.gz | |
Coachz: Remove the keyboard backlight support
Coachz doesn't has an internal keyboard.
Move the CONFIG from baseboard to board, as the keyboard backlight
is not a common feature.
BRANCH=None
BUG=b:167884598
TEST=Built the Coachz image.
Change-Id: Idd5937da9ad6a3ab1be277e537bbd2e70e2b1d9a
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2410855
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
| -rw-r--r-- | baseboard/trogdor/baseboard.h | 1 | ||||
| -rw-r--r-- | board/coachz/board.c | 1 | ||||
| -rw-r--r-- | board/coachz/board.h | 3 | ||||
| -rw-r--r-- | board/coachz/gpio.inc | 2 | ||||
| -rw-r--r-- | board/lazor/board.h | 3 | ||||
| -rw-r--r-- | board/pompom/board.h | 3 | ||||
| -rw-r--r-- | board/trogdor/board.h | 3 |
7 files changed, 10 insertions, 6 deletions
diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h index 1cba3c1371..ab89ef8770 100644 --- a/baseboard/trogdor/baseboard.h +++ b/baseboard/trogdor/baseboard.h @@ -36,7 +36,6 @@ #define CONFIG_FPU #define CONFIG_PWM #define CONFIG_PWM_DISPLIGHT -#define CONFIG_PWM_KBLIGHT #define CONFIG_VBOOT_HASH diff --git a/board/coachz/board.c b/board/coachz/board.c index 70ad1f0de8..ea6f9e9c59 100644 --- a/board/coachz/board.c +++ b/board/coachz/board.c @@ -139,7 +139,6 @@ const struct adc_t adc_channels[] = { BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { .channel = 3, .flags = 0, .freq = 10000 }, /* TODO(waihong): Assign a proper frequency. */ [PWM_CH_DISPLIGHT] = { .channel = 5, .flags = 0, .freq = 4800 }, }; diff --git a/board/coachz/board.h b/board/coachz/board.h index 5749d68bd7..c8a2b0f4cf 100644 --- a/board/coachz/board.h +++ b/board/coachz/board.h @@ -71,8 +71,7 @@ enum sensor_id { }; enum pwm_channel { - PWM_CH_KBLIGHT = 0, - PWM_CH_DISPLIGHT, + PWM_CH_DISPLIGHT = 0, PWM_CH_COUNT }; diff --git a/board/coachz/gpio.inc b/board/coachz/gpio.inc index c8470c143d..0a6bb1bf02 100644 --- a/board/coachz/gpio.inc +++ b/board/coachz/gpio.inc @@ -94,7 +94,6 @@ GPIO(EC_CHG_LED_Y_C1, PIN(C, 3), GPIO_OUT_LOW) GPIO(EC_CHG_LED_B_C1, PIN(C, 4), GPIO_OUT_LOW) /* PWM */ -GPIO(KB_BL_PWM, PIN(8, 0), GPIO_INPUT) /* PWM3 */ GPIO(EDP_BKLTCTL, PIN(B, 7), GPIO_INPUT) /* PWM5 */ /* ADC */ @@ -139,7 +138,6 @@ ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, GPIO_SEL_1P8V) /* I2C7 (GPIOB2/B3) - ALTERNATE(PIN_MASK(4, 0x1C), 0, MODULE_ADC, 0) /* ADC1 (GPIO44), ADC2 (GPIO43), ADC3 (GPIO42) */ ALTERNATE(PIN_MASK(4, 0xC0), 1, MODULE_SPI, GPIO_SEL_1P8V) /* SHI_SDO (GPIO47), SHI_SDI (GPIO46) */ ALTERNATE(PIN_MASK(5, 0x28), 1, MODULE_SPI, GPIO_SEL_1P8V) /* SHI_SCLK (GPIO55), SHI_CS# (GPIO53) */ -ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* PWM3 (GPIO80) - KB_BL_PWM */ ALTERNATE(PIN_MASK(B, 0x80), 1, MODULE_PWM, 0) /* PWM5 (GPIOB7) - EDP_BKLTCTL */ ALTERNATE(PIN_MASK(D, 0x04), 1, MODULE_PMU, 0) /* PSL_IN1 (GPIOD2) - LID_OPEN_EC */ ALTERNATE(PIN_MASK(0, 0x01), 1, MODULE_PMU, 0) /* PSL_IN2 (GPIO00) - ACOK_OD */ diff --git a/board/lazor/board.h b/board/lazor/board.h index 85c5bf8cba..424a7f9075 100644 --- a/board/lazor/board.h +++ b/board/lazor/board.h @@ -25,6 +25,9 @@ /* Switchcap */ #define CONFIG_LN9310 +/* Keyboard */ +#define CONFIG_PWM_KBLIGHT + /* Battery */ #define CONFIG_BATTERY_DEVICE_CHEMISTRY "LION" #define CONFIG_BATTERY_REVIVE_DISCONNECT diff --git a/board/pompom/board.h b/board/pompom/board.h index 598dae781e..71d3918c4b 100644 --- a/board/pompom/board.h +++ b/board/pompom/board.h @@ -23,6 +23,9 @@ /* Internal SPI flash on NPCX7 */ #define CONFIG_FLASH_SIZE (512 * 1024) /* 512KB internal spi flash */ +/* Keyboard */ +#define CONFIG_PWM_KBLIGHT + /* BC 1.2 Charger */ #define CONFIG_BC12_DETECT_PI3USB9201 diff --git a/board/trogdor/board.h b/board/trogdor/board.h index 261977f375..66b2e69c5f 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -25,6 +25,9 @@ /* Internal SPI flash on NPCX7 */ #define CONFIG_FLASH_SIZE (1024 * 1024) /* 1MB internal spi flash */ +/* Keyboard */ +#define CONFIG_PWM_KBLIGHT + /* BC 1.2 Charger */ #if BOARD_REV >= TROGDOR_REV1 #define CONFIG_BC12_DETECT_PI3USB9201 |