diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-09-03 14:13:12 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-09 19:14:55 +0000 |
| commit | f22c156554302e0da2358e04381ad4a9d0413558 (patch) | |
| tree | ed66dbc8d9933757bed41116dcddd14945f40898 | |
| parent | 8af744fdcb4b701456154adc3e9c82d115bf80f0 (diff) | |
| download | chrome-ec-f22c156554302e0da2358e04381ad4a9d0413558.tar.gz | |
Dedede: Define GPIO_USB_C1_INT_ODL for all variants
Naming for the C1 interrupt line varies slightly between variants due to
schematic name differences, and version or functional differences. This
change ensures all boards have GPIO_USB_C1_INT_ODL defined for baseboard
code to reference.
BRANCH=None
BUG=b:153684907
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I9303be2f9f142eed249da4f2f5e660985ceb7fdd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2391213
Tested-by: Divagar Mohandass <divagar.mohandass@intel.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/boten/gpio.inc | 3 | ||||
| -rw-r--r-- | board/madoo/board.h | 3 | ||||
| -rw-r--r-- | board/magolor/board.h | 3 | ||||
| -rw-r--r-- | board/waddledee/board.h | 7 | ||||
| -rw-r--r-- | board/waddledoo/board.h | 8 |
5 files changed, 24 insertions, 0 deletions
diff --git a/board/boten/gpio.inc b/board/boten/gpio.inc index b73f53c091..bfca6fdc9c 100644 --- a/board/boten/gpio.inc +++ b/board/boten/gpio.inc @@ -66,6 +66,9 @@ UNIMPLEMENTED(AC_PRESENT) UNIMPLEMENTED(PG_EC_DSW_PWROK) UNIMPLEMENTED(PG_EC_ALL_SYS_PWRGD) +/* Used by baseboard z-state enable, but not present on boten */ +UNIMPLEMENTED(USB_C1_INT_ODL) + /* I2C pins - Alternate function below configures I2C module on these pins */ GPIO(EC_I2C_EEPROM_SCL, PIN(B, 3), GPIO_INPUT) GPIO(EC_I2C_EEPROM_SDA, PIN(B, 4), GPIO_INPUT) diff --git a/board/madoo/board.h b/board/madoo/board.h index 21558fdc3a..3d99e59627 100644 --- a/board/madoo/board.h +++ b/board/madoo/board.h @@ -29,6 +29,9 @@ #define CONFIG_CMD_TCPC_DUMP #define CONFIG_CMD_CHARGER_DUMP +/* GPIO for C1 interrupts, for baseboard use */ +#define GPIO_USB_C1_INT_ODL GPIO_SUB_USB_C1_INT_ODL + /* Keyboard */ #define CONFIG_PWM_KBLIGHT diff --git a/board/magolor/board.h b/board/magolor/board.h index e2d86922cb..a1d32f1bd4 100644 --- a/board/magolor/board.h +++ b/board/magolor/board.h @@ -32,6 +32,9 @@ #define CONFIG_CMD_TCPC_DUMP #define CONFIG_CMD_CHARGER_DUMP +/* GPIO for C1 interrupts, for baseboard use */ +#define GPIO_USB_C1_INT_ODL GPIO_SUB_USB_C1_INT_ODL + /* Keyboard */ #define CONFIG_PWM_KBLIGHT diff --git a/board/waddledee/board.h b/board/waddledee/board.h index c627316ac9..d4f585a707 100644 --- a/board/waddledee/board.h +++ b/board/waddledee/board.h @@ -32,6 +32,13 @@ #define CONFIG_OCPC #define CONFIG_OCPC_DEF_RBATT_MOHMS 5 /* R_DS(on) 5.3mOhm */ +/* + * GPIO for C1 interrupts, for baseboard use + * + * Note this will only be valid for board revision 1 + */ +#define GPIO_USB_C1_INT_ODL GPIO_USB_C1_INT_V1_ODL + /* LED */ #define CONFIG_LED_PWM #define CONFIG_LED_PWM_COUNT 1 diff --git a/board/waddledoo/board.h b/board/waddledoo/board.h index 98a4b2caca..dce01cf67c 100644 --- a/board/waddledoo/board.h +++ b/board/waddledoo/board.h @@ -32,6 +32,14 @@ #define CONFIG_CMD_TCPC_DUMP #define CONFIG_CMD_CHARGER_DUMP +/* + * GPIO for C1 interrupts, for baseboard use + * + * Note this line might already have its pull up disabled for HDMI DBs, but + * it should be fine to set again before z-state. + */ +#define GPIO_USB_C1_INT_ODL GPIO_SUB_C1_INT_EN_RAILS_ODL + /* Keyboard */ #define CONFIG_PWM_KBLIGHT |