From patchwork Fri Sep 22 18:38:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 9966819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6E48160381 for ; Fri, 22 Sep 2017 18:39:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64ED825223 for ; Fri, 22 Sep 2017 18:39:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59D7A298F8; Fri, 22 Sep 2017 18:39:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E25FE25223 for ; Fri, 22 Sep 2017 18:39:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752333AbdIVSi7 (ORCPT ); Fri, 22 Sep 2017 14:38:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52598 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752332AbdIVSi5 (ORCPT ); Fri, 22 Sep 2017 14:38:57 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 606B0C04B318; Fri, 22 Sep 2017 18:38:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 606B0C04B318 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=hdegoede@redhat.com Received: from dhcp-45-79.space.revspace.nl.com (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E858600C4; Fri, 22 Sep 2017 18:38:53 +0000 (UTC) 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 , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, devel@driverdev.osuosl.org, Kuppuswamy Sathyanarayanan , Sathyanarayanan Kuppuswamy Natarajan , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH v3 12/14] staging: typec: Add Generic TCPC mux driver using the mux subsys Date: Fri, 22 Sep 2017 20:38:01 +0200 Message-Id: <20170922183803.10701-12-hdegoede@redhat.com> In-Reply-To: <20170922183803.10701-1-hdegoede@redhat.com> References: <20170922183803.10701-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 22 Sep 2017 18:38:57 +0000 (UTC) Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Changes in v3: -Use new devm_mux_control_get_optional() -Simplify tcpc_gen_mux_set as we now no longer need to worry about the muxes being present -Adjust for updated MUX_TYPEC_* defines --- drivers/usb/typec/Makefile | 2 +- drivers/usb/typec/tcpc_gen_mux.c | 122 +++++++++++++++++++++++++++++++++++++++ include/linux/usb/tcpm.h | 2 + 3 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 drivers/usb/typec/tcpc_gen_mux.c diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index b77688ce1f16..95a7d9c4527b 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_TYPEC) += typec.o -obj-$(CONFIG_TYPEC_TCPM) += tcpm.o +obj-$(CONFIG_TYPEC_TCPM) += tcpm.o tcpc_gen_mux.o obj-y += fusb302/ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o obj-$(CONFIG_TYPEC_UCSI) += ucsi/ diff --git a/drivers/usb/typec/tcpc_gen_mux.c b/drivers/usb/typec/tcpc_gen_mux.c new file mode 100644 index 000000000000..ea40b52ef6a6 --- /dev/null +++ b/drivers/usb/typec/tcpc_gen_mux.c @@ -0,0 +1,122 @@ +/* + * 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 +#include + +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 typec_state = MUX_TYPEC_USB; + unsigned int usb_state = MUX_USB_DEVICE; + int ret; + + /* Put the muxes back in their open (idle) state */ + if (data->muxes_set) { + mux_control_deselect(data->type_c_mode_mux); + mux_control_deselect(data->usb_role_mux); + data->muxes_set = false; + } + + switch (mux_mode) { + case TYPEC_MUX_NONE: + /* Muxes are in their open state, done. */ + return 0; + case TYPEC_MUX_USB_DEVICE: + typec_state = MUX_TYPEC_USB; + usb_state = MUX_USB_DEVICE; + break; + case TYPEC_MUX_USB_HOST: + typec_state = MUX_TYPEC_USB; + usb_state = MUX_USB_HOST; + break; + case TYPEC_MUX_DP: + typec_state = MUX_TYPEC_DP; + break; + case TYPEC_MUX_DOCK: + typec_state = MUX_TYPEC_USB_AND_DP; + usb_state = MUX_USB_HOST; + break; + } + + if (polarity) + typec_state |= MUX_TYPEC_POLARITY_INV; + + ret = mux_control_select(data->type_c_mode_mux, typec_state); + if (ret) { + dev_err(data->dev, "Error setting Type-C mode mux: %d\n", ret); + return ret; + } + + ret = mux_control_select(data->usb_role_mux, usb_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; + } + + 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); + + /* The use of either mux is optional */ + data->type_c_mode_mux = + devm_mux_control_get_optional(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_optional(dev, "usb-role-mux"); + if (IS_ERR(data->usb_role_mux)) { + ret = PTR_ERR(data->usb_role_mux); + 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/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h index bc76389ee257..3ad97da5fe16 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -207,4 +207,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 */