diff options
author | Denis Brockus <dbrockus@google.com> | 2020-07-17 08:53:39 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-07-17 22:57:28 +0000 |
commit | 41fe226267e3a8c1cb61f9f25123eaea900b4971 (patch) | |
tree | 2e60f764f0b61df6a0fab3ed3660234ecc01aa3c | |
parent | 5dcfd3b5a5cffbe5e6a9ac9221f63d785a7a10af (diff) | |
download | chrome-ec-41fe226267e3a8c1cb61f9f25123eaea900b4971.tar.gz |
zork: Use CBI only and remove retimer probe code
Before CBI was being used, zork used I2C probing to
detect basic hardware configuration. Now that CBI
is supporting FW_CONFIG, this is being removed.
BUG=b:151232257
BRANCH=none
TEST=verify zork still boots with valid configuration
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: I267d99f8f3894aff2f6301df167c470db373509e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2304380
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
-rw-r--r-- | baseboard/zork/cbi_ec_fw_config.c | 10 | ||||
-rw-r--r-- | baseboard/zork/cbi_ec_fw_config.h | 3 | ||||
-rw-r--r-- | board/trembyle/board.c | 26 | ||||
-rw-r--r-- | driver/retimer/ps8802.c | 12 | ||||
-rw-r--r-- | driver/retimer/ps8802.h | 4 | ||||
-rw-r--r-- | driver/retimer/ps8818.c | 16 | ||||
-rw-r--r-- | driver/retimer/ps8818.h | 3 |
7 files changed, 1 insertions, 73 deletions
diff --git a/baseboard/zork/cbi_ec_fw_config.c b/baseboard/zork/cbi_ec_fw_config.c index 1845fa1718..d8101855f7 100644 --- a/baseboard/zork/cbi_ec_fw_config.c +++ b/baseboard/zork/cbi_ec_fw_config.c @@ -10,17 +10,9 @@ /**************************************************************************** * CBI Zork EC FW Configuration */ -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -static uint32_t cached_fw_config = UNINITIALIZED_FW_CONFIG; -void set_cbi_fw_config(uint32_t val) -{ - cached_fw_config = val; -} - uint32_t get_cbi_fw_config(void) { - /* TODO(b:151232257) Remove probe code when hardware supports CBI */ - /* static uint32_t cached_fw_config = UNINITIALIZED_FW_CONFIG; */ + static uint32_t cached_fw_config = UNINITIALIZED_FW_CONFIG; if (cached_fw_config == UNINITIALIZED_FW_CONFIG) { uint32_t val; diff --git a/baseboard/zork/cbi_ec_fw_config.h b/baseboard/zork/cbi_ec_fw_config.h index 7b49464320..9222dd9f45 100644 --- a/baseboard/zork/cbi_ec_fw_config.h +++ b/baseboard/zork/cbi_ec_fw_config.h @@ -98,9 +98,6 @@ enum ec_cfg_lid_angle_tablet_mode_type { EC_CFG_LID_ANGLE_TABLET_MODE_L) -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -void set_cbi_fw_config(uint32_t val); - uint32_t get_cbi_fw_config(void); enum ec_cfg_usb_db_type ec_config_get_usb_db(void); enum ec_cfg_usb_mb_type ec_config_get_usb_mb(void); diff --git a/board/trembyle/board.c b/board/trembyle/board.c index baedf1c030..0c488505a3 100644 --- a/board/trembyle/board.c +++ b/board/trembyle/board.c @@ -242,8 +242,6 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, ps8811_retimer_off, HOOK_PRIO_DEFAULT); static void setup_mux(void) { if (ec_config_has_usbc1_retimer_ps8802()) { - ccprints("C1 PS8802 detected"); - /* * Main MUX is PS8802, secondary MUX is modified FP5 * @@ -261,8 +259,6 @@ static void setup_mux(void) usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; } else if (ec_config_has_usbc1_retimer_ps8818()) { - ccprints("C1 PS8818 detected"); - /* * Main MUX is FP5, secondary MUX is PS8818 * @@ -278,28 +274,6 @@ static void setup_mux(void) } } -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -#include "driver/retimer/ps8802.h" -#include "driver/retimer/ps8818.h" -static void probe_setup_mux_backup(void) -{ - if (usb_muxes[USBC_PORT_C1].driver != NULL) - return; - - /* - * Identifying a PS8818 is faster than the PS8802, - * so do it first. - */ - if (ps8818_detect(&usbc1_ps8818) == EC_SUCCESS) { - set_cbi_fw_config(0x00004000); - setup_mux(); - } else if (ps8802_detect(&usbc1_ps8802) == EC_SUCCESS) { - set_cbi_fw_config(0x00004001); - setup_mux(); - } -} -DECLARE_HOOK(HOOK_CHIPSET_STARTUP, probe_setup_mux_backup, HOOK_PRIO_DEFAULT); - const struct pi3dpx1207_usb_control pi3dpx1207_controls[] = { [USBC_PORT_C0] = { .enable_gpio = IOEX_USB_C0_DATA_EN, diff --git a/driver/retimer/ps8802.c b/driver/retimer/ps8802.c index 27ec41c31d..cb81b84f4e 100644 --- a/driver/retimer/ps8802.c +++ b/driver/retimer/ps8802.c @@ -189,18 +189,6 @@ int ps8802_i2c_wake(const struct usb_mux *me) return rv; } -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -int ps8802_detect(const struct usb_mux *me) -{ - int rv = EC_ERROR_NOT_POWERED; - - /* Detected if we are powered and can read the device */ - if (!chipset_in_state(CHIPSET_STATE_HARD_OFF)) - rv = ps8802_i2c_wake(me); - - return rv; -} - static int ps8802_init(const struct usb_mux *me) { return EC_SUCCESS; diff --git a/driver/retimer/ps8802.h b/driver/retimer/ps8802.h index 8a370d6950..bdcf44dea8 100644 --- a/driver/retimer/ps8802.h +++ b/driver/retimer/ps8802.h @@ -68,10 +68,6 @@ extern const struct usb_mux_driver ps8802_usb_mux_driver; int ps8802_i2c_wake(const struct usb_mux *me); - -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -int ps8802_detect(const struct usb_mux *me); - int ps8802_i2c_read(const struct usb_mux *me, int page, int offset, int *data); int ps8802_i2c_write(const struct usb_mux *me, int page, int offset, int data); int ps8802_i2c_write16(const struct usb_mux *me, int page, int offset, diff --git a/driver/retimer/ps8818.c b/driver/retimer/ps8818.c index c652673986..65abcddd23 100644 --- a/driver/retimer/ps8818.c +++ b/driver/retimer/ps8818.c @@ -98,22 +98,6 @@ int ps8818_i2c_field_update8(const struct usb_mux *me, int page, int offset, return rv; } -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -int ps8818_detect(const struct usb_mux *me) -{ - int rv = EC_ERROR_NOT_POWERED; - int val; - - /* Detected if we are powered and can read the device */ - if (!chipset_in_state(CHIPSET_STATE_HARD_OFF)) - rv = ps8818_i2c_read(me, - PS8818_REG_PAGE0, - PS8818_REG0_FLIP, - &val); - - return rv; -} - static int ps8818_set_mux(const struct usb_mux *me, mux_state_t mux_state) { int rv; diff --git a/driver/retimer/ps8818.h b/driver/retimer/ps8818.h index 8847e54291..ab7ba211ff 100644 --- a/driver/retimer/ps8818.h +++ b/driver/retimer/ps8818.h @@ -80,9 +80,6 @@ extern const struct usb_mux_driver ps8818_usb_retimer_driver; -/* TODO(b:151232257) Remove probe code when hardware supports CBI */ -int ps8818_detect(const struct usb_mux *me); - int ps8818_i2c_read(const struct usb_mux *me, int page, int offset, int *data); int ps8818_i2c_write(const struct usb_mux *me, |