diff options
| author | Sooraj Govindan <sooraj.govindan@intel.com> | 2020-10-19 20:31:48 +0530 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-05 15:36:14 +0000 |
| commit | 89a9b11df0937068c41e38a858821ce20522ab9e (patch) | |
| tree | 1b1c3ba4c0ba6ecbc237b23a18de1728322fb4d9 /board/boldar | |
| parent | 698134043ae3086aa82847d31946055831315362 (diff) | |
| download | chrome-ec-89a9b11df0937068c41e38a858821ce20522ab9e.tar.gz | |
boldar: Modify GPIO assignment as per schematics
BUG=b:162202257
BRANCH=none
TEST=make BOARD=boldar
Signed-off-by: Sooraj Govindan <sooraj.govindan@intel.com>
Change-Id: I6494aff3c5a5b85263c128d04d9584bc509275c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2488260
Tested-by: Sooraj Govindan <sooraj.govindan@intel.corp-partner.google.com>
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: caveh jalali <caveh@chromium.org>
Diffstat (limited to 'board/boldar')
| -rw-r--r-- | board/boldar/board.c | 10 | ||||
| -rw-r--r-- | board/boldar/board.h | 1 | ||||
| -rw-r--r-- | board/boldar/gpio.inc | 13 |
3 files changed, 18 insertions, 6 deletions
diff --git a/board/boldar/board.c b/board/boldar/board.c index 32d7eaadb8..36d91d2f6f 100644 --- a/board/boldar/board.c +++ b/board/boldar/board.c @@ -560,6 +560,12 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ +struct usb_mux usbc0_usb4_db_retimer = { + .usb_port = USBC_PORT_C0, + .driver = &bb_usb_retimer, + .i2c_port = I2C_PORT_USB_1_MIX, + .i2c_addr_flags = USBC_PORT_C0_BB_RETIMER_I2C_ADDR, +}; struct usb_mux usbc1_usb4_db_retimer = { .usb_port = USBC_PORT_C1, .driver = &bb_usb_retimer, @@ -571,6 +577,7 @@ struct usb_mux usb_muxes[] = { .usb_port = USBC_PORT_C0, .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, + .next_mux = &usbc0_usb4_db_retimer, }, [USBC_PORT_C1] = { .usb_port = USBC_PORT_C1, @@ -583,7 +590,8 @@ BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); struct bb_usb_control bb_controls[] = { [USBC_PORT_C0] = { - /* USB-C port 0 doesn't have a retimer */ + .usb_ls_en_gpio = GPIO_USB_C0_LS_EN, + .retimer_rst_gpio = GPIO_USB_C0_RT_RST_ODL, }, [USBC_PORT_C1] = { .usb_ls_en_gpio = GPIO_USB_C1_LS_EN, diff --git a/board/boldar/board.h b/board/boldar/board.h index fce10a1284..5b10629e59 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -96,6 +96,7 @@ /* Enabling USB4 mode */ #define CONFIG_USB_PD_USB4 +#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x37 #define USBC_PORT_C1_BB_RETIMER_I2C_ADDR 0x40 /* USB Type A Features */ diff --git a/board/boldar/gpio.inc b/board/boldar/gpio.inc index e2a3abca0c..b4a6622e1e 100644 --- a/board/boldar/gpio.inc +++ b/board/boldar/gpio.inc @@ -91,6 +91,7 @@ GPIO(USB_C1_OC_ODL, PIN(5, 0), GPIO_ODR_HIGH) GPIO(USB_C1_RT_INT_ODL, PIN(F, 3), GPIO_INPUT) /* Don't have a load switch for retimer */ +UNIMPLEMENTED(USB_C0_LS_EN) UNIMPLEMENTED(USB_C1_LS_EN) /* Misc Signals */ @@ -105,11 +106,10 @@ GPIO(M2_SSD_PLA, PIN(7, 0), GPIO_INPUT) /* SSD power-loss acknowledgment */ GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT) /* Case Closed Debug Mode */ GPIO(EC_SLP_S0IX, PIN(7, 2), GPIO_INPUT | GPIO_PULL_UP) -/* Unused signals */ -GPIO(UNUSED_GPIO41, PIN(4, 1), GPIO_INPUT | GPIO_PULL_UP) -GPIO(UNUSED_GPIOF2, PIN(F, 2), GPIO_INPUT | GPIO_PULL_UP) -GPIO(UNUSED_GPIO96, PIN(9, 6), GPIO_INPUT | GPIO_PULL_UP) -GPIO(UNUSED_GPIO34, PIN(3, 4), GPIO_INPUT | GPIO_PULL_UP) +GPIO(USB_C0_RT_RST_ODL, PIN(4, 1), GPIO_INPUT) /* RST to Burnside bridge */ +GPIO(USB_C0_RT_INT_ODL, PIN(F, 2), GPIO_INPUT) +GPIO(CATERR_L, PIN(3, 4), GPIO_INPUT) /* Catastrophic error */ +GPIO(EC_ESPI_ALERT_L, PIN(5, 7), GPIO_INPUT | GPIO_SEL_1P8V) /* * eDP backlight - both PCH and EC have enable pins that must be high @@ -118,6 +118,9 @@ GPIO(UNUSED_GPIO34, PIN(3, 4), GPIO_INPUT | GPIO_PULL_UP) */ GPIO(EC_EDP_BL_EN, PIN(D, 3), GPIO_OUT_HIGH) +/* Unused signals */ +GPIO(UNUSED_GPIO96, PIN(9, 6), GPIO_INPUT | GPIO_PULL_UP) + /* I2C pins - Alternate function below configures I2C module on these pins */ GPIO(EC_I2C0_SENSOR_SCL, PIN(B, 5), GPIO_INPUT | GPIO_SEL_1P8V) GPIO(EC_I2C0_SENSOR_SDA, PIN(B, 4), GPIO_INPUT | GPIO_SEL_1P8V) |