github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: typec: mux: avoid duplicated orientation switches

Browse Source 
Some devices use combo PHYs (i.e. USB3 + DisplayPort), which also
handle the orientation mux. These PHYs are referenced twice from
the USB-C connector (USB super-speed lines and SBU/AUX lines)
resulting in the switch being configured twice. Avoid this by
dropping duplicates.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://patch.msgid.link/20260223-typec-mux-duplication-fix-v2-1-0402fefc222e@collabora.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sebastian Reichel 2026-02-23 19:27:38 +01:00 committed by Greg Kroah-Hartman
parent f2529d08fc
commit a53b4f9c51
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/typec/mux.c
View File

@ -35,7 +35,9 @@ static int switch_fwnode_match(struct device *dev, const void *fwnode)
static void *typec_switch_match(const struct fwnode_handle *fwnode, static void *typec_switch_match(const struct fwnode_handle *fwnode,
const char *id, void *data) const char *id, void *data)
{ {
struct typec_switch_dev **sw_devs = data;
struct device *dev; struct device *dev;
int i;
/* /*
* Device graph (OF graph) does not give any means to identify the * Device graph (OF graph) does not give any means to identify the
@ -56,6 +58,13 @@ static void *typec_switch_match(const struct fwnode_handle *fwnode,
dev = class_find_device(&typec_mux_class, NULL, fwnode, dev = class_find_device(&typec_mux_class, NULL, fwnode,
switch_fwnode_match); switch_fwnode_match);
/* Skip duplicates */
for (i = 0; i < TYPEC_MUX_MAX_DEVS; i++)
if (to_typec_switch_dev(dev) == sw_devs[i]) {
put_device(dev);
return NULL;
}
return dev ? to_typec_switch_dev(dev) : ERR_PTR(-EPROBE_DEFER); return dev ? to_typec_switch_dev(dev) : ERR_PTR(-EPROBE_DEFER);
} }
@ -80,7 +89,8 @@ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode)
if (!sw) if (!sw)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
count = fwnode_connection_find_matches(fwnode, "orientation-switch", NULL, count = fwnode_connection_find_matches(fwnode, "orientation-switch",
(void **)sw_devs,
typec_switch_match, typec_switch_match,
(void **)sw_devs, (void **)sw_devs,
ARRAY_SIZE(sw_devs)); ARRAY_SIZE(sw_devs));