diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2021-10-25 17:26:06 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-26 17:29:29 +0000 |
| commit | 71865096d3945f59aec48c784d0db47aa53e53cc (patch) | |
| tree | 5d9acb010210ee5cb1805bf56f277b2a6afa8499 | |
| parent | 596a620e9ae16b8553d67efb11f5ced3c6dc1685 (diff) | |
| download | chrome-ec-71865096d3945f59aec48c784d0db47aa53e53cc.tar.gz | |
board/dalboz: Use correct enum type
When building with clang, it warns:
board/dalboz/board.c:178:43: error: implicit conversion from enumeration
type 'enum ioex_signal' to different enumeration type 'enum gpio_signal'
[-Werror,-Wenum-conversion]
enum gpio_signal IOEX_USB_A1_RETIMER_EN = IOEX_USB_A1_RETIMER_EN_OPT1;
~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
board/dalboz/board.c:179:47: error: implicit conversion from enumeration
type 'enum ioex_signal' to different enumeration type 'enum gpio_signal'
[-Werror,-Wenum-conversion]
enum gpio_signal IOEX_USB_A1_CHARGE_EN_DB_L = IOEX_USB_A1_CHARGE_EN_DB_L_OPT1;
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
BRANCH=none
BUG=b:172020503
TEST=make buildall -j
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I1a90a0814d850406de797077eabc7ba1a4356974
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3243004
Reviewed-by: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | board/dalboz/board.c | 4 | ||||
| -rw-r--r-- | board/dalboz/board.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/dalboz/board.c b/board/dalboz/board.c index 8b1dc01b39..5e65298b82 100644 --- a/board/dalboz/board.c +++ b/board/dalboz/board.c @@ -175,8 +175,8 @@ struct motion_sensor_t motion_sensors[] = { unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); /* These IO expander GPIOs vary with DB option. */ -enum gpio_signal IOEX_USB_A1_RETIMER_EN = IOEX_USB_A1_RETIMER_EN_OPT1; -enum gpio_signal IOEX_USB_A1_CHARGE_EN_DB_L = IOEX_USB_A1_CHARGE_EN_DB_L_OPT1; +enum ioex_signal IOEX_USB_A1_RETIMER_EN = IOEX_USB_A1_RETIMER_EN_OPT1; +enum ioex_signal IOEX_USB_A1_CHARGE_EN_DB_L = IOEX_USB_A1_CHARGE_EN_DB_L_OPT1; static void pcal6408_handler(void) { diff --git a/board/dalboz/board.h b/board/dalboz/board.h index eecdc72d41..419ce6f913 100644 --- a/board/dalboz/board.h +++ b/board/dalboz/board.h @@ -195,8 +195,8 @@ static inline bool ec_config_has_hdmi_retimer_pi3hdx1204(void) } /* These IO expander GPIOs vary with DB option. */ -extern enum gpio_signal IOEX_USB_A1_RETIMER_EN; -extern enum gpio_signal IOEX_USB_A1_CHARGE_EN_DB_L; +extern enum ioex_signal IOEX_USB_A1_RETIMER_EN; +extern enum ioex_signal IOEX_USB_A1_CHARGE_EN_DB_L; void board_reset_pd_mcu(void); |