From 2c8fd1b299b481793145ba3594fe27994be503da Mon Sep 17 00:00:00 2001 From: Rob Barnes Date: Wed, 21 Apr 2021 16:09:50 -0600 Subject: usb_mux/amd_fp6: Handle chipset_reset The driver was only handling chipset_resume. chipset_reset also needs to be handled. Otherwise mux won't be set on an apreset. BUG=None TEST=C1 display works after apreset BRANCH=None Signed-off-by: Rob Barnes Change-Id: I0ec336a733e51d44be7ea95f8fcfeb8a606d50a1 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2845269 Reviewed-by: Diana Z --- driver/usb_mux/amd_fp6.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'driver') diff --git a/driver/usb_mux/amd_fp6.c b/driver/usb_mux/amd_fp6.c index 7f1e57cc78..88f6b5aff5 100644 --- a/driver/usb_mux/amd_fp6.c +++ b/driver/usb_mux/amd_fp6.c @@ -216,8 +216,14 @@ static void amd_fp6_chipset_resume(void) } DECLARE_HOOK(HOOK_CHIPSET_RESUME, amd_fp6_chipset_resume, HOOK_PRIO_DEFAULT); +static int amd_fp6_chipset_reset(const struct usb_mux *me) +{ + amd_fp6_chipset_resume(); + return EC_SUCCESS; +} + const struct usb_mux_driver amd_fp6_usb_mux_driver = { .set = &amd_fp6_set_mux, .get = &amd_fp6_get_mux, - /* .chipset_reset is handled by amd_fp6_chipset_resume hook */ + .chipset_reset = &amd_fp6_chipset_reset }; -- cgit v1.2.1