From 4f5a9d9e1a1724bfb92823cdb94f7d87217d5953 Mon Sep 17 00:00:00 2001 From: Devin Lu Date: Tue, 14 Sep 2021 10:52:33 +0800 Subject: garg: Remove keyboard backlight support Garg does not support keyboard backlight. Remove this feature to free up flash space BUG=none BRANCH=none TEST=make BOARD=garg Signed-off-by: Devin Lu Change-Id: Iafeb208440caf8fde6067821aa156ede57acd888 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3159426 Reviewed-by: Diana Z Commit-Queue: Diana Z --- board/garg/board.c | 11 ----------- board/garg/board.h | 9 --------- board/garg/gpio.inc | 6 ++---- 3 files changed, 2 insertions(+), 24 deletions(-) (limited to 'board') diff --git a/board/garg/board.c b/board/garg/board.c index be8bc07d36..c5e4b4b83f 100644 --- a/board/garg/board.c +++ b/board/garg/board.c @@ -319,17 +319,6 @@ static void cbi_init(void) } DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); -__override uint32_t board_override_feature_flags0(uint32_t flags0) -{ - /* - * Remove keyboard backlight feature for devices that don't support it. - */ - if (sku_id == 255) - return flags0; - else - return (flags0 & ~EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB)); -} - void board_hibernate_late(void) { int i; diff --git a/board/garg/board.h b/board/garg/board.h index d10086b56a..273601824c 100644 --- a/board/garg/board.h +++ b/board/garg/board.h @@ -58,10 +58,6 @@ #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 */ @@ -85,11 +81,6 @@ enum temp_sensor_id { TEMP_SENSOR_COUNT }; -enum pwm_channel { - PWM_CH_KBLIGHT, - PWM_CH_COUNT -}; - /* Motion sensors */ enum sensor_id { LID_ACCEL, diff --git a/board/garg/gpio.inc b/board/garg/gpio.inc index 378434a505..995986d600 100644 --- a/board/garg/gpio.inc +++ b/board/garg/gpio.inc @@ -136,9 +136,6 @@ GPIO(BAT_LED_ORANGE_L, PIN(C, 3), GPIO_OUT_HIGH) /* LED_1_L */ GPIO(BAT_LED_BLUE_L, PIN(C, 4), GPIO_OUT_HIGH) /* LED_2_L */ GPIO(LED_3_L, PIN(D, 7), GPIO_OUT_HIGH) -/* Keyboard Backlight */ -GPIO(KB_BL_PWR_EN, PIN(6, 2), GPIO_OUT_LOW) - /* MKBP event synchronization */ GPIO(EC_INT_L, PIN(9, 4), GPIO_ODR_HIGH) @@ -158,6 +155,8 @@ GPIO(EC_I2S_SFRM, PIN(A, 5), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2S_SCLK, PIN(A, 7), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2S_TX_PCH_RX, PIN(B, 0), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(WFCAM_VSYNC, PIN(0, 3), GPIO_INPUT) +GPIO(KB_BL_PWR_EN, PIN(6, 2), GPIO_INPUT) +GPIO(EC_GPIO80, PIN(8, 0), GPIO_INPUT) /* Keyboard pins */ ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_00-01 */ @@ -181,7 +180,6 @@ ALTERNATE(PIN_MASK(B, 0x0C), 0, MODULE_I2C, (GPIO_INPUT | GPIO_SEL_1P8V)) /* 1.8 ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ ALTERNATE(PIN_MASK(4, 0x02), 0, MODULE_ADC, 0) /* ADC4 */ ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0) /* ADC9 */ -ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* PWM3: KB_BL_PWM */ /* Power Switch Logic (PSL) inputs */ ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, 0) /* GPIOD2 = LID_OPEN */ -- cgit v1.2.1