diff options
| author | Matt_Wang <Matt_Wang@compal.corp-partner.google.com> | 2021-08-17 19:07:51 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-24 18:26:04 +0000 |
| commit | e64cff762ca018ccf81c16e5c8a02416213a0d11 (patch) | |
| tree | 16e385f29fd9a0411e691c09cfb5753cc0270790 /board/driblee | |
| parent | b55e5e7624eb0b688400b5505020e7318809ba60 (diff) | |
| download | chrome-ec-e64cff762ca018ccf81c16e5c8a02416213a0d11.tar.gz | |
driblee: Remove GPIO43 of ADC Alternate function
Remove GPIO43 of ADC Alternate function and set Input and Internal pull
up.
BUG=b:196922068
BRANCH=keeby
TEST=make BOARD=driblee
Signed-off-by: Matt_Wang <Matt_Wang@compal.corp-partner.google.com>
Change-Id: I915342d8f40aeed68c24885992e5a88f42e7deef
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3099390
Tested-by: Matt Wang <matt_wang@compal.corp-partner.google.com>
Reviewed-by: Elmo Lan <elmo_lan@compal.corp-partner.google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/driblee')
| -rw-r--r-- | board/driblee/board.c | 38 | ||||
| -rw-r--r-- | board/driblee/board.h | 1 | ||||
| -rw-r--r-- | board/driblee/gpio.inc | 3 |
3 files changed, 2 insertions, 40 deletions
diff --git a/board/driblee/board.c b/board/driblee/board.c index f5b99c7c35..43f000197f 100644 --- a/board/driblee/board.c +++ b/board/driblee/board.c @@ -155,13 +155,6 @@ const struct adc_t adc_channels[] = { .factor_div = ADC_READ_MAX + 1, .shift = 0, }, - [ADC_SUB_ANALOG] = { - .name = "SUB_ANALOG", - .input_ch = NPCX_ADC_CH2, - .factor_mul = ADC_MAX_VOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - }, [ADC_VSNS_PP3300_A] = { .name = "PP3300_A_PGOOD", .input_ch = NPCX_ADC_CH9, @@ -501,34 +494,3 @@ int button_is_adc_detected(enum gpio_signal gpio) { return (gpio == GPIO_VOLUME_DOWN_L) || (gpio == GPIO_VOLUME_UP_L); } - -static void adc_vol_key_press_check(void) -{ - int volt = adc_read_channel(ADC_SUB_ANALOG); - static uint8_t old_adc_key_state; - uint8_t adc_key_state_change; - - if (volt > 2400 && volt < 2490) { - /* volume-up is pressed */ - new_adc_key_state = ADC_VOL_UP_MASK; - } else if (volt > 2600 && volt < 2690) { - /* volume-down is pressed */ - new_adc_key_state = ADC_VOL_DOWN_MASK; - } else if (volt < 2290) { - /* both volumn-up and volume-down are pressed */ - new_adc_key_state = ADC_VOL_UP_MASK | ADC_VOL_DOWN_MASK; - } else if (volt > 2700) { - /* both volumn-up and volume-down are released */ - new_adc_key_state = 0; - } - if (new_adc_key_state != old_adc_key_state) { - adc_key_state_change = old_adc_key_state ^ new_adc_key_state; - if (adc_key_state_change && ADC_VOL_UP_MASK) - button_interrupt(GPIO_VOLUME_UP_L); - if (adc_key_state_change && ADC_VOL_DOWN_MASK) - button_interrupt(GPIO_VOLUME_DOWN_L); - - old_adc_key_state = new_adc_key_state; - } -} -DECLARE_HOOK(HOOK_TICK, adc_vol_key_press_check, HOOK_PRIO_DEFAULT); diff --git a/board/driblee/board.h b/board/driblee/board.h index de19136aff..8f2e7fc53c 100644 --- a/board/driblee/board.h +++ b/board/driblee/board.h @@ -112,7 +112,6 @@ enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC0 */ ADC_TEMP_SENSOR_2, /* ADC1 */ - ADC_SUB_ANALOG, /* ADC2 */ ADC_VSNS_PP3300_A, /* ADC9 */ ADC_CH_COUNT }; diff --git a/board/driblee/gpio.inc b/board/driblee/gpio.inc index e5823a011c..b5da00de32 100644 --- a/board/driblee/gpio.inc +++ b/board/driblee/gpio.inc @@ -97,7 +97,7 @@ UNIMPLEMENTED(VOLUP_BTN_ODL) /* Alternate Functions */ /* ADC */ ALTERNATE(PIN_MASK(F, BIT(0)), 0, MODULE_ADC, 0) /* ADC9 */ -ALTERNATE(PIN_MASK(4, 0x38), 0, MODULE_ADC, 0) /* ADC0-2 */ +ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ /* Keyboard */ ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT | GPIO_PULL_UP) /* KSI0, KSI1 */ @@ -120,6 +120,7 @@ ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0) /* I2C1 SDA */ /* NC pins, enable internal pull-up to avoid floating state. */ GPIO(GPIO32_NC, PIN(3, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO35_NC, PIN(3, 5), GPIO_INPUT | GPIO_PULL_UP) +GPIO(GPIO43_NC, PIN(4, 3), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO57_NC, PIN(5, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO81_NC, PIN(8, 1), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO86_NC, PIN(8, 6), GPIO_INPUT | GPIO_PULL_UP) |