Skip to content

Commit

Permalink
usb: typec: mux: Allow muxes to specify mode-switch
Browse files Browse the repository at this point in the history
Loosen the typec_mux_match() requirements so that searches where an
alt mode is not specified, but the target mux device lists the
"mode-switch" property, return a success.

This is helpful in Type C port drivers which would like to get a pointer
to the mux switch associated with a Type C port, but don't want to
specify a particular alt mode.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://lore.kernel.org/r/20220615172129.1314056-2-pmalani@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Prashant Malani authored and Greg Kroah-Hartman committed Jun 21, 2022
1 parent d9be8d5 commit 144a96f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/usb/typec/mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,13 @@ static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,
if (match)
goto find_mux;

/* Accessory Mode muxes */
if (!desc) {
match = fwnode_property_present(fwnode, "accessory");
/*
* Accessory Mode muxes & muxes which explicitly specify
* the required identifier can avoid SVID matching.
*/
match = fwnode_property_present(fwnode, "accessory") ||
fwnode_property_present(fwnode, id);
if (match)
goto find_mux;
return NULL;
Expand Down

0 comments on commit 144a96f

Please sign in to comment.