usb: typec: Rationalize the API for the muxes

Since with accessory modes there is no need for additional
identification when requesting a handle to the mux, we can
replace the second parameter that is passed to the
typec_mux_get() function with a pointer to alternate mode
description structure, and simply passing NULL with
accessory modes.

This change means the naming of the mux device connections
can be updated. Alternate and Accessory Modes will both be
handled with muxes named "mode-switch", and the orientation
switches will be named "orientation-switch".

Future identification of the alternate modes will be later
done using device property "svid" of the mux.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 41c0d790a50f93673e9ff9db57cc9ad762bb5b55..45abe2c7e9f3514dd98c44379e02be3654d30dd6 100644 (file)
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -1496,11 +1496,8 @@ typec_port_register_altmode(struct typec_port *port,
 {
        struct typec_altmode *adev;
        struct typec_mux *mux;
-       char id[10];
 
-       sprintf(id, "id%04xm%02x", desc->svid, desc->mode);
-
-       mux = typec_mux_get(&port->dev, id);
+       mux = typec_mux_get(&port->dev, desc);
        if (IS_ERR(mux))
                return ERR_CAST(mux);
 
@@ -1593,7 +1590,7 @@ struct typec_port *typec_register_port(struct device *parent,
                return ERR_CAST(port->sw);
        }
 
-       port->mux = typec_mux_get(&port->dev, "typec-mux");
+       port->mux = typec_mux_get(&port->dev, NULL);
        if (IS_ERR(port->mux)) {
                put_device(&port->dev);
                return ERR_CAST(port->mux);

diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
index d990aa510fabf008a332706c34fe3f61b2929e82..8975f58e1d603b68ff080fddf8d8185ef17cdecf 100644 (file)
--- a/drivers/usb/typec/mux.c
+++ b/drivers/usb/typec/mux.c
@@ -48,7 +48,7 @@ struct typec_switch *typec_switch_get(struct device *dev)
        struct typec_switch *sw;
 
        mutex_lock(&switch_lock);
-       sw = device_connection_find_match(dev, "typec-switch", NULL,
+       sw = device_connection_find_match(dev, "orientation-switch", NULL,
                                          typec_switch_match);
        if (!IS_ERR_OR_NULL(sw)) {
                WARN_ON(!try_module_get(sw->dev->driver->owner));
@@ -128,19 +128,21 @@ static void *typec_mux_match(struct device_connection *con, int ep, void *data)
 /**
  * typec_mux_get - Find USB Type-C Multiplexer
  * @dev: The caller device
- * @name: Mux identifier
+ * @desc: Alt Mode description
  *
  * Finds a mux linked to the caller. This function is primarily meant for the
  * Type-C drivers. Returns a reference to the mux on success, NULL if no
  * matching connection was found, or ERR_PTR(-EPROBE_DEFER) when a connection
  * was found but the mux has not been enumerated yet.
  */
-struct typec_mux *typec_mux_get(struct device *dev, const char *name)
+struct typec_mux *typec_mux_get(struct device *dev,
+                               const struct typec_altmode_desc *desc)
 {
        struct typec_mux *mux;
 
        mutex_lock(&mux_lock);
-       mux = device_connection_find_match(dev, name, NULL, typec_mux_match);
+       mux = device_connection_find_match(dev, "mode-switch", (void *)desc,
+                                          typec_mux_match);
        if (!IS_ERR_OR_NULL(mux)) {
                WARN_ON(!try_module_get(mux->dev->driver->owner));
                get_device(mux->dev);

diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h
index 79293f630ee12b52665ae0513dc5f9985f3584c3..43f40685e53c4c5a2c8545e31a1597da6517b061 100644 (file)
--- a/include/linux/usb/typec_mux.h
+++ b/include/linux/usb/typec_mux.h
@@ -47,7 +47,8 @@ void typec_switch_put(struct typec_switch *sw);
 int typec_switch_register(struct typec_switch *sw);
 void typec_switch_unregister(struct typec_switch *sw);
 
-struct typec_mux *typec_mux_get(struct device *dev, const char *name);
+struct typec_mux *
+typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc);
 void typec_mux_put(struct typec_mux *mux);
 int typec_mux_register(struct typec_mux *mux);
 void typec_mux_unregister(struct typec_mux *mux);