diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-03-17 23:44:43 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-20 18:14:21 +0000 |
| commit | 455c33c43c72c838a46db4b58520489f57c3363a (patch) | |
| tree | 7278c52a4c74d44eb1f5b2ad3c4cae087b29a38f | |
| parent | 32a40f3a2cfe46607e5d259927aec67c3c7d47ef (diff) | |
| download | chrome-ec-455c33c43c72c838a46db4b58520489f57c3363a.tar.gz | |
dalboz: Set usb_port_enable[] for DB option
BUG=b:150349225
BRANCH=none
TEST=none
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I9e914a767a6b0fd1d77b3c32a2414711531404f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2108337
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | baseboard/zork/baseboard.h | 9 | ||||
| -rw-r--r-- | baseboard/zork/variant_dalboz.c | 2 | ||||
| -rw-r--r-- | baseboard/zork/variant_trembyle.c | 2 | ||||
| -rw-r--r-- | board/dalboz/board.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 693b4b77ff..6c7872c32e 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -171,10 +171,11 @@ #define CONFIG_USB_MUX_PS8740 #define CONFIG_IO_EXPANDER_PCAL6408 #define CONFIG_IO_EXPANDER_PORT_COUNT IOEX_PORT_COUNT + #define CONFIG_USB_PORT_ENABLE_DYNAMIC #endif /* USB-A config */ -#define USB_PORT_COUNT 2 +#define USB_PORT_COUNT USBA_PORT_COUNT #define CONFIG_USB_PORT_POWER_SMART #define CONFIG_USB_PORT_POWER_SMART_CDP_SDP_ONLY #define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_CDP @@ -284,6 +285,12 @@ enum fan_channel { FAN_CH_COUNT, }; +enum usba_port { + USBA_PORT_A0 = 0, + USBA_PORT_A1, + USBA_PORT_COUNT +}; + enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_C1, diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c index b45b009218..8e9b04802f 100644 --- a/baseboard/zork/variant_dalboz.c +++ b/baseboard/zork/variant_dalboz.c @@ -43,7 +43,7 @@ BUILD_ASSERT(ARRAY_SIZE(ioex_config) == CONFIG_IO_EXPANDER_PORT_COUNT); * USB-A */ -const int usb_port_enable[USB_PORT_COUNT] = { +int usb_port_enable[USBA_PORT_COUNT] = { IOEX_EN_USB_A0_5V, IOEX_EN_USB_A1_5V_DB_OPT1, }; diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index e73604038c..65ab0ae19b 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -149,7 +149,7 @@ void mst_hpd_interrupt(enum ioex_signal signal) * USB-A Power */ -const int usb_port_enable[USB_PORT_COUNT] = { +const int usb_port_enable[USBA_PORT_COUNT] = { IOEX_EN_USB_A0_5V, IOEX_EN_USB_A1_5V_DB, }; diff --git a/board/dalboz/board.c b/board/dalboz/board.c index 04b8b4ca2a..6753663bb9 100644 --- a/board/dalboz/board.c +++ b/board/dalboz/board.c @@ -140,12 +140,14 @@ static void setup_usb_db(void) ioex_init(IOEX_HDMI_PCAL6408); IOEX_USB_A1_RETIMER_EN = IOEX_USB_A1_RETIMER_EN_OPT2; IOEX_USB_A1_CHARGE_EN_DB_L = IOEX_USB_A1_CHARGE_EN_DB_L_OPT2; + usb_port_enable[USBA_PORT_A1] = IOEX_EN_USB_A1_5V_DB_OPT2; } else { ccprints("DB OPT1 USBC"); ioex_config[IOEX_C1_NCT3807].flags = 0; ioex_init(IOEX_C1_NCT3807); IOEX_USB_A1_RETIMER_EN = IOEX_USB_A1_RETIMER_EN_OPT1; IOEX_USB_A1_CHARGE_EN_DB_L = IOEX_USB_A1_CHARGE_EN_DB_L_OPT1; + usb_port_enable[USBA_PORT_A1] = IOEX_EN_USB_A1_5V_DB_OPT1; } /* Enable PPC interrupts. */ |