diff options
| -rw-r--r-- | board/kukui/board.c | 13 | ||||
| -rw-r--r-- | board/kukui/board.h | 1 | ||||
| -rw-r--r-- | board/kukui/gpio.inc | 9 |
3 files changed, 11 insertions, 12 deletions
diff --git a/board/kukui/board.c b/board/kukui/board.c index 91ff178fb3..46e387ae62 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -71,7 +71,6 @@ const struct adc_t adc_channels[] = { [ADC_BOARD_ID] = {"BOARD_ID", 3300, 4096, 0, STM32_AIN(10)}, [ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)}, [ADC_BATT_ID] = {"BATT_ID", 3300, 4096, 0, STM32_AIN(7)}, - [ADC_USBC_THERM] = {"USBC_THERM", 3300, 4096, 0, STM32_AIN(14)}, [ADC_POGO_ADC_INT_L] = {"POGO_ADC_INT_L", 3300, 4096, 0, STM32_AIN(6)}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -242,9 +241,17 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); static void board_rev_init(void) { /* Board revision specific configs. */ - if (board_get_version() >= 2) { - gpio_set_flags(GPIO_USBC_THERM, GPIO_ANALOG); +#ifdef BOARD_KUKUI + /* + * It's a P1 pin BOOTBLOCK_MUX_OE, also a P2 pin BC12_DET_EN. + * Keep this pin defaults to P1 setting since that eMMC enabled with + * High-Z stat. + */ + if (board_get_version() == 1) + gpio_set_flags(GPIO_BC12_DET_EN, GPIO_ODR_HIGH); +#endif + if (board_get_version() >= 2) { /* * Enable MT6370 DB_POSVOUT/DB_NEGVOUT (controlled by _EN pins). */ diff --git a/board/kukui/board.h b/board/kukui/board.h index 2548e836fa..3eff3b3d9e 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -211,7 +211,6 @@ enum adc_channel { ADC_EC_SKU_ID, ADC_BATT_ID, ADC_POGO_ADC_INT_L, - ADC_USBC_THERM, ADC_CH_COUNT }; diff --git a/board/kukui/gpio.inc b/board/kukui/gpio.inc index 04010dc714..2581810d68 100644 --- a/board/kukui/gpio.inc +++ b/board/kukui/gpio.inc @@ -87,14 +87,7 @@ GPIO(EN_PP3300_POGO, PIN(A, 13), GPIO_OUT_LOW) GPIO(EN_POGO_CHARGE_L, PIN(B, 6), GPIO_OUT_HIGH) GPIO(EN_USBC_CHARGE_L, PIN(C, 7), GPIO_OUT_LOW) GPIO(EN_PP5000_USBC, PIN(D, 2), GPIO_OUT_LOW) - -/* - * It's a P1 pin BOOTBLOCK_MUX_OE, also a P2 pin USBC_THERM (test poin). - * Keep this pin defaults to P1 setting since that eMMC enabled with - * High-Z stat. - * TODO(b:122866184): Rename this pin as BC12_DET_EN. - */ -GPIO(USBC_THERM, PIN(C, 4), GPIO_ODR_HIGH) +GPIO(BC12_DET_EN, PIN(C, 4), GPIO_OUT_HIGH) /* USART1: PA9/PA10 */ ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, 0) |