Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1725376

[PATCH 09/11] staging: typec: Add Generic TCPC mux driver using the mux subsys

From Hans de Goede <hdegoede@redhat.com>
Newsgroups linux.kernel
Subject [PATCH 09/11] staging: typec: Add Generic TCPC mux driver using the mux subsys
Date 2017-09-02 00:00 +0200
Message-ID <ul28N-2mX-5@gated-at.bofh.it> (permalink)
References <ul1Z7-2jb-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

So far the mux functionality of the tcpm code has not been hooked up
in any tcpc drivers. This commit adds a generic TCPC mux driver using
the mux subsys, which tcpc drivers can use to provide mux functionality
in cases where an external my is used.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/staging/typec/Makefile       |   2 +-
 drivers/staging/typec/tcpc_gen_mux.c | 129 +++++++++++++++++++++++++++++++++++
 drivers/staging/typec/tcpm.h         |   2 +
 3 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 drivers/staging/typec/tcpc_gen_mux.c

diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile
index 30a7e29cbc9e..623d78114ee3 100644
--- a/drivers/staging/typec/Makefile
+++ b/drivers/staging/typec/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_TYPEC_TCPM)	+= tcpm.o
+obj-$(CONFIG_TYPEC_TCPM)	+= tcpm.o tcpc_gen_mux.o
 obj-$(CONFIG_TYPEC_TCPCI)	+= tcpci.o
 obj-y				+= fusb302/
diff --git a/drivers/staging/typec/tcpc_gen_mux.c b/drivers/staging/typec/tcpc_gen_mux.c
new file mode 100644
index 000000000000..dc725e17b106
--- /dev/null
+++ b/drivers/staging/typec/tcpc_gen_mux.c
@@ -0,0 +1,129 @@
+/*
+ * Generic TCPC mux driver using the mux subsys
+ *
+ * Copyright (c) 2017 Hans de Goede <hdegoede@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation, or (at your option)
+ * any later version.
+ */
+
+#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mux/consumer.h>
+#include "tcpm.h"
+
+struct tcpc_gen_mux_data {
+	struct tcpc_mux_dev mux;
+	struct device *dev;
+	struct mux_control *type_c_mode_mux; /* Type-C cross switch / mux */
+	struct mux_control *usb_role_mux;    /* USB Device / Host mode mux */
+	bool muxes_set;
+};
+
+static int tcpc_gen_mux_set(struct tcpc_mux_dev *mux_dev,
+			    enum tcpc_mux_mode mux_mode,
+			    enum tcpc_usb_switch usb_config,
+			    enum typec_cc_polarity polarity)
+{
+	struct tcpc_gen_mux_data *data =
+		container_of(mux_dev, struct tcpc_gen_mux_data, mux);
+	unsigned int state = MUX_USB_NONE;
+	int ret;
+
+	switch (mux_mode) {
+	case TYPEC_MUX_NONE:
+		state = MUX_USB_NONE;
+		break;
+	case TYPEC_MUX_USB_DEVICE:
+		state = MUX_USB_DEVICE;
+		break;
+	case TYPEC_MUX_USB_HOST:
+		state = MUX_USB_HOST;
+		break;
+	case TYPEC_MUX_DP:
+		state = MUX_USB_DP_SRC;
+		break;
+	case TYPEC_MUX_DOCK:
+		state = MUX_USB_HOST_AND_DP_SRC;
+		break;
+	}
+
+	if (polarity)
+		state |= MUX_USB_POLARITY_INV;
+
+	/*
+	 * The mux framework expects multiple competing users, so we must
+	 * release our previous setting before applying the new one.
+	 */
+	if (data->muxes_set) {
+		mux_control_deselect(data->type_c_mode_mux);
+		if (data->usb_role_mux)
+			mux_control_deselect(data->usb_role_mux);
+		data->muxes_set = false;
+	}
+
+	ret = mux_control_select(data->type_c_mode_mux, state);
+	if (ret) {
+		dev_err(data->dev, "Error setting Type-C mode mux: %d\n", ret);
+		return ret;
+	}
+
+	if (!data->usb_role_mux)
+		goto out;
+
+	ret = mux_control_select(data->usb_role_mux, state);
+	if (ret) {
+		dev_err(data->dev, "Error setting USB role mux: %d\n", ret);
+		mux_control_deselect(data->type_c_mode_mux);
+		return ret;
+	}
+
+out:
+	data->muxes_set = true;
+	return 0;
+}
+
+struct tcpc_mux_dev *devm_tcpc_gen_mux_create(struct device *dev)
+{
+	struct tcpc_gen_mux_data *data;
+	int ret;
+
+	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+	if (!data)
+		return ERR_PTR(-ENOMEM);
+
+	data->type_c_mode_mux = devm_mux_control_get(dev, "type-c-mode-mux");
+	if (IS_ERR(data->type_c_mode_mux)) {
+		ret = PTR_ERR(data->type_c_mode_mux);
+		if (ret != -EPROBE_DEFER)
+			dev_err(dev, "Error getting Type-C mux: %d\n", ret);
+		return ERR_PTR(-ret);
+	}
+
+	data->usb_role_mux = devm_mux_control_get(dev, "usb-role-mux");
+	if (IS_ERR(data->usb_role_mux)) {
+		ret = PTR_ERR(data->usb_role_mux);
+		/* The USB role mux is optional */
+		if (ret == -ENODEV) {
+			data->usb_role_mux = NULL;
+		} else {
+			if (ret != -EPROBE_DEFER)
+				dev_err(dev, "Error getting USB role mux: %d\n",
+					ret);
+			return ERR_PTR(-ret);
+		}
+	}
+
+	data->dev = dev;
+	data->mux.set = tcpc_gen_mux_set;
+
+	return &data->mux;
+}
+EXPORT_SYMBOL_GPL(devm_tcpc_gen_mux_create);
+
+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
+MODULE_DESCRIPTION("Generic Type-C mux driver using the mux subsys");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/typec/tcpm.h b/drivers/staging/typec/tcpm.h
index f662eed48c86..36789005a2b0 100644
--- a/drivers/staging/typec/tcpm.h
+++ b/drivers/staging/typec/tcpm.h
@@ -164,4 +164,6 @@ void tcpm_pd_transmit_complete(struct tcpm_port *port,
 void tcpm_pd_hard_reset(struct tcpm_port *port);
 void tcpm_tcpc_reset(struct tcpm_port *port);
 
+struct tcpc_mux_dev *devm_tcpc_gen_mux_create(struct device *dev);
+
 #endif /* __LINUX_USB_TCPM_H */
-- 
2.13.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/11] mux/typec: Add USB / TypeC mux drivers and hook them up on some x86 systems Hans de Goede <hdegoede@redhat.com> - 2017-09-01 23:50 +0200
  [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant defines Hans de Goede <hdegoede@redhat.com> - 2017-09-01 23:50 +0200
    Re: [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant defines Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-09-02 12:20 +0200
      Re: [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant  defines Hans de Goede <hdegoede@redhat.com> - 2017-09-02 14:10 +0200
    Re: [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant  defines Guenter Roeck <linux@roeck-us.net> - 2017-09-02 17:10 +0200
      Re: [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant  defines Hans de Goede <hdegoede@redhat.com> - 2017-09-02 18:00 +0200
        Re: [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant  defines Guenter Roeck <linux@roeck-us.net> - 2017-09-02 21:10 +0200
          Re: [PATCH 03/11] mux: consumer.h: Add MUX_USB_* state constant  defines Hans de Goede <hdegoede@redhat.com> - 2017-09-02 21:50 +0200
  [PATCH 08/11] staging: typec: tcpm: Set mux to device mode when configured as such Hans de Goede <hdegoede@redhat.com> - 2017-09-01 23:50 +0200
  [PATCH 07/11] extcon: intel-int3496: Add support for controlling the USB-role mux Hans de Goede <hdegoede@redhat.com> - 2017-09-01 23:50 +0200
    Re: [PATCH 07/11] extcon: intel-int3496: Add support for controlling  the USB-role mux Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-09-02 12:40 +0200
      Re: [PATCH 07/11] extcon: intel-int3496: Add support for controlling  the USB-role mux Hans de Goede <hdegoede@redhat.com> - 2017-09-04 16:20 +0200
  [PATCH 10/11] staging: typec: fusb302: Hook up mux support using tcpc_gen_mux support Hans de Goede <hdegoede@redhat.com> - 2017-09-01 23:50 +0200
  [PATCH 01/11] mux: core: Add of_mux_control_get helper function Hans de Goede <hdegoede@redhat.com> - 2017-09-01 23:50 +0200
  [PATCH 09/11] staging: typec: Add Generic TCPC mux driver using the mux subsys Hans de Goede <hdegoede@redhat.com> - 2017-09-02 00:00 +0200
  [PATCH 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg phy mux handling Hans de Goede <hdegoede@redhat.com> - 2017-09-02 00:00 +0200
    Re: [PATCH 04/11] usb: xhci: Add Intel cherrytrail extended cap /  otg phy mux handling Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-09-04 09:40 +0200
      Re: [PATCH 04/11] usb: xhci: Add Intel cherrytrail extended cap / otg  phy mux handling Hans de Goede <hdegoede@redhat.com> - 2017-09-05 12:10 +0200
  [PATCH 06/11] mux: Add Pericom PI3USB30532 Type-C mux driver Hans de Goede <hdegoede@redhat.com> - 2017-09-02 00:00 +0200
  [PATCH 02/11] mux: core: Add support for getting a mux controller on a non DT platform Hans de Goede <hdegoede@redhat.com> - 2017-09-02 00:00 +0200
    Re: [PATCH 02/11] mux: core: Add support for getting a mux controller  on a non DT platform sathya <sathyaosid@gmail.com> - 2017-09-02 21:20 +0200
      Re: [PATCH 02/11] mux: core: Add support for getting a mux controller  on a non DT platform Hans de Goede <hdegoede@redhat.com> - 2017-09-04 16:30 +0200
    Re: [PATCH 02/11] mux: core: Add support for getting a mux controller  on a non DT platform Hans de Goede <hdegoede@redhat.com> - 2017-09-05 13:00 +0200
  Re: [PATCH 00/11] mux/typec: Add USB / TypeC mux drivers and hook  them up on some x86 systems Hans de Goede <hdegoede@redhat.com> - 2017-09-05 13:00 +0200

csiph-web