From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbdIAVu0 (ORCPT ); Fri, 1 Sep 2017 17:50:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33418 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752759AbdIAVt2 (ORCPT ); Fri, 1 Sep 2017 17:49:28 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 711DC806B8 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=hdegoede@redhat.com From: Hans de Goede To: MyungJoo Ham , Chanwoo Choi , Guenter Roeck , Heikki Krogerus , Darren Hart , Andy Shevchenko , Peter Rosin , Mathias Nyman Cc: Hans de Goede , platform-driver-x86@vger.kernel.org, devel@driverdev.osuosl.org, Kuppuswamy Sathyanarayanan , Sathyanarayanan Kuppuswamy Natarajan , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH 09/11] staging: typec: Add Generic TCPC mux driver using the mux subsys Date: Fri, 1 Sep 2017 23:48:43 +0200 Message-Id: <20170901214845.7153-10-hdegoede@redhat.com> In-Reply-To: <20170901214845.7153-1-hdegoede@redhat.com> References: <20170901214845.7153-1-hdegoede@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 01 Sep 2017 21:49:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 + * + * 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 +#include +#include +#include +#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 "); +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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH 09/11] staging: typec: Add Generic TCPC mux driver using the mux subsys Date: Fri, 1 Sep 2017 23:48:43 +0200 Message-ID: <20170901214845.7153-10-hdegoede@redhat.com> References: <20170901214845.7153-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170901214845.7153-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: MyungJoo Ham , Chanwoo Choi , Guenter Roeck , Heikki Krogerus , Darren Hart , Andy Shevchenko , Peter Rosin , Mathias Nyman Cc: devel@driverdev.osuosl.org, Kuppuswamy Sathyanarayanan , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Sathyanarayanan Kuppuswamy Natarajan , Hans de Goede List-Id: platform-driver-x86.vger.kernel.org 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 --- 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 + * + * 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 +#include +#include +#include +#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 "); +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