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 /driver/retimer | |
| 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>
Diffstat (limited to 'driver/retimer')
| -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 |
4 files changed, 0 insertions, 35 deletions
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, |