diff options
author | Scott Collyer <scollyer@google.com> | 2017-05-30 09:31:45 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-06-02 12:25:47 -0700 |
commit | 9b28aa45314a86d383b0f5405438e8f465bc7018 (patch) | |
tree | fce35ff329b379aa4e361643649ffbbd0823483d /board/coral/gpio.inc | |
parent | ea274f2722f432f8f9f4b3f83336dd25d0f6d4f7 (diff) | |
download | chrome-ec-9b28aa45314a86d383b0f5405438e8f465bc7018.tar.gz |
coral: GPIO modifications for differences from Reef
Account for EC GPIO changes from Reef to Coral.
BUG=b:35584895
BRANCH=none
TEST=Run 'make BOARD=coral' and verify it builds. Can't test on actual
HW yet as the boards aren't build yet.
Change-Id: If677e152f10b9e12870f14f57503b082e71ff938
Signed-off-by: Scott Collyer <scollyer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/517361
Commit-Ready: Scott Collyer <scollyer@chromium.org>
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Diffstat (limited to 'board/coral/gpio.inc')
-rw-r--r-- | board/coral/gpio.inc | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/board/coral/gpio.inc b/board/coral/gpio.inc index fb45f2336b..ee197c7a6a 100644 --- a/board/coral/gpio.inc +++ b/board/coral/gpio.inc @@ -71,11 +71,7 @@ GPIO(PCH_SMI_L, PIN(A, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_SMI_ODL */ GPIO(PCH_SCI_L, PIN(A, 7), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_SCI_ODL */ GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT) /* SLP_S0_L */ -/* - * BRD_ID1 is a an ADC pin which will be used to measure multiple values. - * Assert EC_BRD_ID_EN_ODL and then read BRD_ID1. - */ -ALTERNATE(PIN_MASK(4, 0x08), 1, MODULE_ADC, 0) +/* Enable for board and SKU ID ADCs */ GPIO(EC_BRD_ID_EN_ODL, PIN(3, 5), GPIO_INPUT) GPIO(CCD_MODE_ODL, PIN(6, 3), GPIO_INPUT) @@ -121,7 +117,8 @@ GPIO(PCH_RCIN_L, PIN(6, 1), GPIO_ODR_HIGH) /* SYS_RST_ODL */ /* FIXME: What, if anything, to do about EC_RST_ODL on VCC1_RST#? */ GPIO(CHARGER_RST_ODL, PIN(C, 0), GPIO_ODR_HIGH) -GPIO(USB_A_CHARGE_EN_L, PIN(4, 2), GPIO_OUT_LOW) +GPIO(USB_A_CHARGE_EN_L, PIN(8, 4), GPIO_OUT_LOW) +GPIO(EN_USB_A_5V, PIN(0, 0), GPIO_OUT_HIGH) GPIO(EN_USB_TCPC_PWR, PIN(C, 3), GPIO_OUT_LOW) GPIO(USB1_ENABLE, PIN(4, 1), GPIO_OUT_LOW) @@ -135,15 +132,12 @@ GPIO(USB_C1_PD_RST_ODL, PIN(7, 4), GPIO_ODR_LOW) GPIO(USB_C0_5V_EN, PIN(D, 3), GPIO_OUT_LOW | GPIO_PULL_UP) /* EN_USB_C0_5V_OUT, Enable C0 */ GPIO(USB_C1_5V_EN, PIN(D, 2), GPIO_OUT_LOW | GPIO_PULL_UP) /* EN_USB_C1_5V_OUT, Enable C1 */ -/* Clear for non-HDI breakout, must be pulled high */ -GPIO(NC1, PIN(0, 0), GPIO_INPUT | GPIO_PULL_UP | GPIO_SEL_1P8V) -GPIO(NC2, PIN(8, 4), GPIO_INPUT | GPIO_PULL_UP | GPIO_SEL_1P8V) - -GPIO(ENG_STRAP, PIN(B, 6), GPIO_INPUT) - GPIO(BAT_LED_BLUE, PIN(8, 0), GPIO_OUT_HIGH) GPIO(BAT_LED_AMBER, PIN(C, 4), GPIO_OUT_HIGH) +/* LTE Module Enable */ +GPIO(EN_PP3300_DX_LTE, PIN(B, 6), GPIO_OUT_LOW) + /* * Alternate function pins */ @@ -158,8 +152,10 @@ ALTERNATE(PIN_MASK(0, 0xe0), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) ALTERNATE(PIN_MASK(1, 0x7f), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) GPIO(KBD_KSO2, PIN(1, 7), GPIO_KB_OUTPUT_COL2) -ALTERNATE(PIN(4, 4), 6, MODULE_ADC, 0) /* TEMP_SENSOR_AMB (FIXME: alt function 6?) */ -ALTERNATE(PIN(4, 5), 6, MODULE_ADC, 0) /* TEMP_SENSOR_CHARGER (FIXME: alt function?) */ +/* Board and SKU ID ADC inputs (GPIO 41, 42, 43) */ +ALTERNATE(PIN_MASK(4, 0x02), 1, MODULE_ADC, 0) +ALTERNATE(PIN_MASK(4, 0x04), 1, MODULE_ADC, 0) +ALTERNATE(PIN_MASK(4, 0x08), 1, MODULE_ADC, 0) ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* GPIO87 for EC_I2C_GYRO_SDA */ ALTERNATE(PIN_MASK(9, 0x01), 1, MODULE_I2C, 0) /* GPIO90 for EC_I2C_GYRO_SCL */ |