From patchwork Mon Oct 2 10:20:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 147513 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1716826vqb; Mon, 2 Oct 2023 15:06:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmx6IxlADi2P/6QmxNiw6gh6Qg6pN0HXkl6olWzqcJnPLD0atyOxFcSJEM9xtt3nTOS7uY X-Received: by 2002:a25:6ad6:0:b0:d7b:9af4:e1d with SMTP id f205-20020a256ad6000000b00d7b9af40e1dmr9991471ybc.58.1696284367056; Mon, 02 Oct 2023 15:06:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284367; cv=none; d=google.com; s=arc-20160816; b=b6q/Fb2qSER8WEYSSQE80VqFfwVqcoPNwuxPC8bpJkrwSICK4Qc/HSjnHOwY2kAz7v IRe0IAQws4GHzeMvE2Ey2d83LB+auLnagLUI+mZfJnsz6pE2u/kC5nR6/Q1sxGRunnq7 8Wf2uoRORcRo/K8fX/zsoRbRAmaoMNLUbTLWm6A1owkifKDbAZZ1q1KgUs9+OXE2iSbg /7DmC2wG3beNLLWXF5lPzwpbicMHhIthycFEWoUoL7iNkbsd5wBWSnscpnx23GPKgOAx vbTAGzZNg18C1j8f5T5NRhbe4ZuFKLLCldIJdDjtvl2N0uQjCqP5lYeoqtCmlfld1aIN dM0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=fvPQtc3n+AQ43mIboHGUgEC6liC/yfr/8rGlBJbQd4M=; fh=/biVkWRZ+R3F3WjM+R1O1hg1vzWe4GxEZ1/1HFbwy1E=; b=HQMj8HdxcevtvzG/D7TcltFs/iS2W10VJAzg/ECHg9f8y0mLxJsGBCBA0LZKXECK03 zZ7Y2sIc4lSHWB+vu0s0s+99oyXzKLNYKhHs1JvR7tC5Lnii692pag4b65UYspa3bnoT 7ZskVWFlANkH5AS+diS4MvOfsdjqcobEH8KRBBGNQnGwLaLZiSUzv91hHGs8KXkCaP3o umd2MHg39RUVjbtFjjSuhg7YlJ6nPoOiu/i8MOyuPbDK0btNrSNpslRaaBp6R8Dsk2+1 aAZ/UkHZDsC0JvlLoYDDlYh0VuBhytS0GnQf5oqaY1GYIVUKqX3bfCGmSrLJ6C2aBpei SR/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="i8cVf5/S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id l62-20020a639141000000b00574035fd472si9126030pge.31.2023.10.02.15.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:06:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="i8cVf5/S"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 74C7D8074683; Mon, 2 Oct 2023 03:21:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236491AbjJBKUu (ORCPT + 16 others); Mon, 2 Oct 2023 06:20:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236444AbjJBKUi (ORCPT ); Mon, 2 Oct 2023 06:20:38 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F7F4FA for ; Mon, 2 Oct 2023 03:20:34 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32336a30d18so8116594f8f.2 for ; Mon, 02 Oct 2023 03:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696242032; x=1696846832; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=fvPQtc3n+AQ43mIboHGUgEC6liC/yfr/8rGlBJbQd4M=; b=i8cVf5/Sgrtwqj9B4+mwRdMn3KaA7Da8yK4N8w9jP9oLYeS2vz2Z/TDn+zezi6kTT3 r2osTCRZ0J9Q1w3IznBpxq8gTQ5A27n9ZjaYTeAsJaORuEHI7BScaeKr3kzBEC5Ln4x0 boke+BNufRNNCiSNLamzgob2eajTSOHQT/yEJMWXwNnhkvaBuxSyG7Xj34gv44e2+AsZ kYTqHcibwUGdszNdcu5UG4SOXU8UMfWo+XSATW9ifXiIXDSk29roT8QmWtSTfaMBqVNS OhGzb/YCycwr2oBKnSzDQTwbiEMLB99b8kZZNetHJ8Tx2xbUi6BEbdspHzslDFhs3VYs 8iPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696242032; x=1696846832; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fvPQtc3n+AQ43mIboHGUgEC6liC/yfr/8rGlBJbQd4M=; b=DyuxuZCSuGBvb/nu0VZx59ic8eJzwqYdl5eLjgAHkvWCQJgNzKOXevDo1MmV8J0A2A 5vShAsO7KudPsMNaS51vtY1+3aH0hkDPnbit1HZSz0zktaZ99hhJLSCkpa+bcl8Dq2vP 1s+eWjNhDcavE8GQ7fHA4fqIDN7QaUbiLRAEaPAWLofMTd8W3d6kvPqqyTsDiAJqZsGc KZw2lC/fUxkeqFPVAk8FokoLsCFSUJW9rwFll4fS73/Jh1if6z9F/ze8aXAorUY15+MH SL933mqNmNnnqG0csXN/iJTXS8xw8J8/E9Gq+Y4QYVIC+TLKMXsfGmmzQi5fbVL7TyQ7 vOfw== X-Gm-Message-State: AOJu0YyqOSyQTxXZHc++vo7j2tkz/tyXyAPRJGIBkdK8/AXjXV4/HOwO /W2Mlnw/ou7/fayo45t5qhCWag== X-Received: by 2002:a5d:5944:0:b0:313:e971:53af with SMTP id e4-20020a5d5944000000b00313e97153afmr9057173wri.32.1696242032607; Mon, 02 Oct 2023 03:20:32 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id g18-20020a5d5552000000b003196b1bb528sm27822901wrw.64.2023.10.02.03.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 03:20:32 -0700 (PDT) From: Neil Armstrong Date: Mon, 02 Oct 2023 12:20:22 +0200 Subject: [PATCH v2 2/4] usb: ucsi: glink: use the connector orientation GPIO to provide switch events MIME-Version: 1.0 Message-Id: <20231002-topic-sm8550-upstream-type-c-orientation-v2-2-125410d3ff95@linaro.org> References: <20231002-topic-sm8550-upstream-type-c-orientation-v2-0-125410d3ff95@linaro.org> In-Reply-To: <20231002-topic-sm8550-upstream-type-c-orientation-v2-0-125410d3ff95@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heikki Krogerus , Greg Kroah-Hartman Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3618; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=2Yx8kmPz9CwCyctqse+y5FCFBBh71PuYcaSNl/C5414=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBlGplsF7+Dg78ioO42z+RuUb9rBfP5QAdO7swu1U+v EZHsKOaJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZRqZbAAKCRB33NvayMhJ0aDdD/ sHvCQ54Ei75dbWMtkUnD2MA9Hd4JvdfmCEBHJGZoMKSPHM6IcIxOLSXVgZViCk7+XT4p1oxnRHg6Gx YlGdsQ9TkgbvxXJ9BHlIh0++1GgO7wwHT07Fm7nxly3kKCgcEM+wszHLBPlp/8xCyNGHRYjN1d59MI p6mzWy9ssA2/bBq9ZF8JA8RyKQPAzOjQ0RiGBWOnUdPg5Aqr1vDbm0XwR5hEdeO+6driVpx761Lykv JZtwsNZNCqWgpWvrRRBhjaN6P4n4ei0higGOeva7YIl6UFomKOZiGgUk5Mi5Q3jacS/t4dia5H/sf0 25bhM/QFfHbqCu/T0xmE2xOBF+vTvPBFN8uX98FMPk+fUQHSEy24ajC3XLf1ZbUauuF9ob3o3uRuvv 6Pu8M5OyZ2IwoDqLrUuRPMFYEgX/ly6Aqmx+x717asxvIssUa+NmsI9WpyxGMyAMeF/VxkTb/wpdfV bYoD9OZpRfJ9Eae9pUdGzNd6E6vlyaAf2Nh5XLBWgKplvy9/K/xLhZ6Val2kh8KsWZgKtuiyAOipvB rFFAU0ab9UrXBuunBnH/3ZezOavkzblQ6eKkBNqJiTEPMGrR81gSKsKwtef9Mqi2jkLB0vjPFy7XkC b84pfO+COAb8Vr1cXoVOaeXuq2SzVrhQlA6K0arHujksBAD0TtYC2EkFK+tA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 03:21:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778670711033280275 X-GMAIL-MSGID: 1778683076609095555 On SM8550, the non-altmode orientation is not given anymore within altmode events, even with USB SVIDs events. On the other side, the Type-C connector orientation is correctly reported by a signal from the PMIC. Take this gpio signal when we detect some Type-C port activity to notify any Type-C switches tied to the Type-C port connectors. Acked-by: Heikki Krogerus Signed-off-by: Neil Armstrong Acked-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/usb/typec/ucsi/ucsi_glink.c | 54 ++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c index bb1854b3311d..db6e248f8208 100644 --- a/drivers/usb/typec/ucsi/ucsi_glink.c +++ b/drivers/usb/typec/ucsi/ucsi_glink.c @@ -8,9 +8,13 @@ #include #include #include +#include +#include #include #include "ucsi.h" +#define PMIC_GLINK_MAX_PORTS 2 + #define UCSI_BUF_SIZE 48 #define MSG_TYPE_REQ_RESP 1 @@ -52,6 +56,9 @@ struct ucsi_notify_ind_msg { struct pmic_glink_ucsi { struct device *dev; + struct gpio_desc *port_orientation[PMIC_GLINK_MAX_PORTS]; + struct typec_switch *port_switch[PMIC_GLINK_MAX_PORTS]; + struct pmic_glink_client *client; struct ucsi *ucsi; @@ -220,8 +227,20 @@ static void pmic_glink_ucsi_notify(struct work_struct *work) } con_num = UCSI_CCI_CONNECTOR(cci); - if (con_num) + if (con_num) { + if (con_num < PMIC_GLINK_MAX_PORTS && + ucsi->port_orientation[con_num - 1]) { + int orientation = gpiod_get_value(ucsi->port_orientation[con_num - 1]); + + if (orientation >= 0) { + typec_switch_set(ucsi->port_switch[con_num - 1], + orientation ? TYPEC_ORIENTATION_REVERSE + : TYPEC_ORIENTATION_NORMAL); + } + } + ucsi_connector_change(ucsi->ucsi, con_num); + } if (ucsi->sync_pending && cci & UCSI_CCI_BUSY) { ucsi->sync_val = -EBUSY; @@ -282,6 +301,7 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev, { struct pmic_glink_ucsi *ucsi; struct device *dev = &adev->dev; + struct fwnode_handle *fwnode; int ret; ucsi = devm_kzalloc(dev, sizeof(*ucsi), GFP_KERNEL); @@ -309,6 +329,38 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev, ucsi_set_drvdata(ucsi->ucsi, ucsi); + device_for_each_child_node(dev, fwnode) { + struct gpio_desc *desc; + u32 port; + + ret = fwnode_property_read_u32(fwnode, "reg", &port); + if (ret < 0) { + dev_err(dev, "missing reg property of %pOFn\n", fwnode); + return ret; + } + + if (port >= PMIC_GLINK_MAX_PORTS) { + dev_warn(dev, "invalid connector number, ignoring\n"); + continue; + } + + desc = devm_gpiod_get_index_optional(&adev->dev, "orientation", port, GPIOD_IN); + + /* If GPIO isn't found, continue */ + if (!desc) + continue; + + if (IS_ERR(desc)) + return dev_err_probe(dev, PTR_ERR(desc), + "unable to acquire orientation gpio\n"); + ucsi->port_orientation[port] = desc; + + ucsi->port_switch[port] = fwnode_typec_switch_get(fwnode); + if (IS_ERR(ucsi->port_switch[port])) + return dev_err_probe(dev, PTR_ERR(ucsi->port_switch[port]), + "failed to acquire orientation-switch\n"); + } + ucsi->client = devm_pmic_glink_register_client(dev, PMIC_GLINK_OWNER_USBC, pmic_glink_ucsi_callback,