diff options
| author | Prashant Malani <pmalani@chromium.org> | 2023-01-12 22:16:08 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-17 17:29:00 +0100 |
| commit | 6681e43f5095a64bc3e37822f64d91d284a062dc (patch) | |
| tree | e05dcea5cf16ae3ed9b8644958cc32d57dabec4d /drivers/usb/typec/bus.c | |
| parent | 2c8cb236ed44d071ef2ed1fbb948eea404551788 (diff) | |
| download | linux-6681e43f5095a64bc3e37822f64d91d284a062dc.tar.gz linux-6681e43f5095a64bc3e37822f64d91d284a062dc.tar.bz2 linux-6681e43f5095a64bc3e37822f64d91d284a062dc.zip | |
usb: typec: Make bus switch code retimer-aware
Since ports can have retimers associated with them, update the Type-C
alternate mode bus code to also set retimer state when the switch state
is updated.
While we are here, make the typec_retimer_dev_type declaration in the
retimer.h file as extern, so that the header file can be successfully
included in the bus code without redeclaration compilation errors.
Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230112221609.540754-4-pmalani@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/bus.c')
| -rw-r--r-- | drivers/usb/typec/bus.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 9f1bbd26ca47..0c8d554240be 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -11,6 +11,22 @@ #include "bus.h" #include "class.h" #include "mux.h" +#include "retimer.h" + +static inline int +typec_altmode_set_retimer(struct altmode *alt, unsigned long conf, void *data) +{ + struct typec_retimer_state state; + + if (!alt->retimer) + return 0; + + state.alt = &alt->adev; + state.mode = conf; + state.data = data; + + return typec_retimer_set(alt->retimer, &state); +} static inline int typec_altmode_set_mux(struct altmode *alt, unsigned long conf, void *data) @@ -31,6 +47,12 @@ typec_altmode_set_mux(struct altmode *alt, unsigned long conf, void *data) static inline int typec_altmode_set_switches(struct altmode *alt, unsigned long conf, void *data) { + int ret; + + ret = typec_altmode_set_retimer(alt, conf, data); + if (ret) + return ret; + return typec_altmode_set_mux(alt, conf, data); } |