diff options
| author | Matthew Blecker <matthewb@chromium.org> | 2020-03-06 17:53:18 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-07 00:22:49 +0000 |
| commit | 86c6cf43cf870cef8cfb1974a8af64352ca9cec6 (patch) | |
| tree | a02656159d9fcec49e6ca5e691b89ecf3279f521 /board/ampton | |
| parent | 7f8843dfaa31f3748ba4c5c8be052e2ecdc79f04 (diff) | |
| download | chrome-ec-86c6cf43cf870cef8cfb1974a8af64352ca9cec6.tar.gz | |
Revert "Ampton: Set the PS8751 to source mode before enter low power mode"
This reverts commit 4ca73139635261ee1273fbe1767dcf06886d2208.
Reason for revert:
Breaks CCD with AP off https://issuetracker.google.com/150822168
Will work on a solution to address the original CL need, i.e. applying
Rp in LPM. Follow the above bug.
Some merge conflict happens. Resolved.
Also change the usb_mux driver of Trogdor, as ps8xxx_usb_mux_driver
is removed.
Original change's description:
> Ampton: Set the PS8751 to source mode before enter low power mode
>
> BUG=b:113830171
> BRANCH=octopus
> TEST=check the power consumption is lower
>
> Change-Id: I527cdc5d1e4dd5de137ab0927e66c171696758ce
> Signed-off-by: James_Chao <james_chao@asus.corp-partner.google.com>
> Reviewed-on: https://chromium-review.googlesource.com/1426306
> Commit-Ready: James Chao <james_chao@asus.corp-partner.google.com>
> Tested-by: James Chao <james_chao@asus.corp-partner.google.com>
> Reviewed-by: Jett Rink <jettrink@chromium.org>
BRANCH=None
BUG=b:113830171,150822168
TEST=Build Trogdor, verified CCD with AP off working.
Change-Id: I58c26e8466b70e035a1c396cfcba6a46da4bccc9
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2091519
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Matthew Blecker <matthewb@chromium.org>
Diffstat (limited to 'board/ampton')
| -rw-r--r-- | board/ampton/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/ampton/board.c b/board/ampton/board.c index 4f1f0880df..7646ab3c85 100644 --- a/board/ampton/board.c +++ b/board/ampton/board.c @@ -75,7 +75,7 @@ const struct usb_mux ampton_usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { .i2c_port = I2C_PORT_USBC0, .i2c_addr_flags = PS8751_I2C_ADDR1_FLAGS, .flags = USB_MUX_FLAG_NOT_TCPC, - .driver = &ps8xxx_usb_mux_driver, + .driver = &tcpci_tcpm_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, .board_init = &tune_mux, }, @@ -85,7 +85,7 @@ const struct usb_mux ampton_usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { .i2c_port = I2C_PORT_USBC1, .i2c_addr_flags = PS8751_I2C_ADDR1_FLAGS, .flags = USB_MUX_FLAG_NOT_TCPC, - .driver = &ps8xxx_usb_mux_driver, + .driver = &tcpci_tcpm_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, .board_init = &tune_mux, } |