diff options
| author | johnwc_yeh <johnwc_yeh@compal.corp-partner.google.com> | 2021-04-12 10:30:00 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-12 18:31:23 +0000 |
| commit | 99115990760d4a8bf984bdc4298ee9168990bed8 (patch) | |
| tree | b33e52502ff816f3a7319dee22139d13a1f3e71b /board/cret | |
| parent | fc3eb82a81dc639fe9e8581a10034e62744685e7 (diff) | |
| download | chrome-ec-99115990760d4a8bf984bdc4298ee9168990bed8.tar.gz | |
cret: Remove GPIO43 of ADC Alternate function
Remove GPIO43 of ADC Alternate function and set Input and Internal pull up.
BUG=b:181325655
BRANCH=dedede
TEST=make BOARD=cret
Signed-off-by: johnwc_yeh <johnwc_yeh@compal.corp-partner.google.com>
Change-Id: I3e506c0916a284a57afa93f8e100f45c285a38bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2817683
Reviewed-by: Elthan Huang <elthan_huang@compal.corp-partner.google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/cret')
| -rw-r--r-- | board/cret/board.c | 7 | ||||
| -rw-r--r-- | board/cret/board.h | 1 | ||||
| -rw-r--r-- | board/cret/gpio.inc | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/board/cret/board.c b/board/cret/board.c index 4d0f5168dc..972ced52eb 100644 --- a/board/cret/board.c +++ b/board/cret/board.c @@ -153,13 +153,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, diff --git a/board/cret/board.h b/board/cret/board.h index 0974bf9603..899f315096 100644 --- a/board/cret/board.h +++ b/board/cret/board.h @@ -152,7 +152,6 @@ enum chg_id { 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/cret/gpio.inc b/board/cret/gpio.inc index 921a5b3914..085c8e95b0 100644 --- a/board/cret/gpio.inc +++ b/board/cret/gpio.inc @@ -101,7 +101,7 @@ UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) /* 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 */ @@ -137,6 +137,7 @@ GPIO(GPIOF2_NC, PIN(F, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIOF3_NC, PIN(F, 3), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO37_NC, PIN(3, 7), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO34_NC, PIN(3, 4), GPIO_INPUT | GPIO_PULL_UP) +GPIO(GPIO43_NC, PIN(4, 3), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO60_NC, PIN(6, 0), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO72_NC, PIN(7, 2), GPIO_INPUT | GPIO_PULL_UP) GPIO(GPIO86_NC, PIN(8, 6), GPIO_INPUT | GPIO_PULL_UP) |