From nobody Mon Jun 29 15:59:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C338C4332F for ; Tue, 8 Feb 2022 03:17:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346092AbiBHDRc (ORCPT ); Mon, 7 Feb 2022 22:17:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346082AbiBHDR1 (ORCPT ); Mon, 7 Feb 2022 22:17:27 -0500 Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E969C061A73 for ; Mon, 7 Feb 2022 19:17:26 -0800 (PST) Received: by mail-oo1-xc29.google.com with SMTP id b15-20020a4a878f000000b002dccc412166so16067449ooi.11 for ; Mon, 07 Feb 2022 19:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hKVB3bLU9ggU9XnI+AMZ3/ImzjFmGTnZ5s7LsYvB5HY=; b=iXg+t3mv3JSzkAmVUlNVijgq9YJGHaIh3dQu0xBUekyv13sQzqbkaSGSlV3tX0CoL7 WLk4IZglQYRlgcucpl/KfREjjFGtiITjCyn9Iau1dyVjdxD3mPE4I66oToTa1npnNtxl 3fMPGCKE/YnsU1VyrQl6zuEJq12k/+b7yAAxaDow8pQKA1oAjHEro+VoTNt+/xw26nQw hIyh4p8tePEmzonuEwICzq/2c+PT9Q5CTY7kG+/Hon9afsM6pqOy32FFbOW8GisJR2h4 9URw183zYIYMosRASAeOaTj12X40p8Qj5vao3pQU1D5jf0hs3KJb8vVoFlF6ofJkUbEO 53+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hKVB3bLU9ggU9XnI+AMZ3/ImzjFmGTnZ5s7LsYvB5HY=; b=e6r4ZSmY7pSGJJSj4PoDd15vdI+L2oPuITQvv+E2DpgliZCEOMeC5nw6ksjxnblG4p iciaWP5XL1s51hGsgrZhXlAvUYfxeXn+sTo2uiAUtWHmmXJwxyk1/dwpksMvCHu5jqXY q76Gd0cfeesZK1/IYdDXuPK1FRS+anjtp1O0PyiWIMWox3Mu2YuEhLXnDJkxjlLD4b+z A+3r6zVPXYAC6ZJf3J90oEq6WO08PZmKpvNQcFmXpYgaaM7PanfedPBQZqyTBZGcwtsj 7t62bwILKdZazUMj/Zu8dUteOJjnvXmqgzP96sgSENB1Q5+NfXXbDA3smhO968Ivxlll 791w== X-Gm-Message-State: AOAM5319M87Q3bnronItO+PMYULFb8haK6xtqbNVG4BhkGYRfCQpsGO9 o3glLYcE28T6vnCqSumbxo9l2g== X-Google-Smtp-Source: ABdhPJzNXbV7SXPjsWrTumDVo6Zop43VSEbRgLTX/k6A2Bmrr/gqoq7thcv8r+rEDkX4KfjmSF+vNQ== X-Received: by 2002:a05:6870:b1d3:: with SMTP id x19mr659151oak.101.1644290245976; Mon, 07 Feb 2022 19:17:25 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id k3sm4763873otl.41.2022.02.07.19.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 19:17:25 -0800 (PST) From: Bjorn Andersson To: Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 1/6] device property: Helper to match multiple connections Date: Mon, 7 Feb 2022 19:19:39 -0800 Message-Id: <20220208031944.3444-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208031944.3444-1-bjorn.andersson@linaro.org> References: <20220208031944.3444-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In some cases multiple connections with the same connection id needs to be resolved from a fwnode graph. One such example is when separate hardware is used for performing muxing and/or orientation switching of the SuperSpeed and SBU lines in a USB-C connector. In this case the connector needs to belong to a graph with multiple matching remote endpoints, and the TypeC controller needs to be able to resolve them both. Add a new API that allows this kind of lookup. Given that the match() callback returns an opaque reference to something provided by the client it's not possible for the implementation to release the returned object and as such it's not possible to handle errors, which in turn means that it's not possible to query the number of elements or dynamically grow the results array. It's however expected that the number of matches will be reasonably low and that the worst case is known by the caller before hand. Signed-off-by: Bjorn Andersson Tested-by: Hans de Goede --- Changes since v1: - Iterator in fwnode_devcon_matches() is now unsigned. - fwnode_handle_put() node for unavailable nodes. - Extended commit message on the subject of supporting dynamically sized "matches" array. drivers/base/property.c | 96 ++++++++++++++++++++++++++++++++++++++++ include/linux/property.h | 5 +++ 2 files changed, 101 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index e6497f6877ee..5230ff5c8d48 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1189,6 +1189,38 @@ fwnode_graph_devcon_match(struct fwnode_handle *fwno= de, const char *con_id, return NULL; } =20 +static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwno= de, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, + unsigned int matches_len) +{ + struct fwnode_handle *node; + struct fwnode_handle *ep; + unsigned int count =3D 0; + void *ret; + + fwnode_graph_for_each_endpoint(fwnode, ep) { + if (count >=3D matches_len) { + fwnode_handle_put(ep); + return count; + } + + node =3D fwnode_graph_get_remote_port_parent(ep); + if (!fwnode_device_is_available(node)) { + fwnode_handle_put(node); + continue; + } + + ret =3D match(node, con_id, data); + fwnode_handle_put(node); + + if (ret) + matches[count++] =3D ret; + } + return count; +} + static void * fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id, void *data, devcon_match_fn_t match) @@ -1211,6 +1243,35 @@ fwnode_devcon_match(struct fwnode_handle *fwnode, co= nst char *con_id, return NULL; } =20 +static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, + unsigned int matches_len) +{ + struct fwnode_handle *node; + unsigned int count =3D 0; + unsigned int i; + void *ret; + + for (i =3D 0; ; i++) { + if (count >=3D matches_len) + return count; + + node =3D fwnode_find_reference(fwnode, con_id, i); + if (IS_ERR(node)) + break; + + ret =3D match(node, NULL, data); + fwnode_handle_put(node); + + if (ret) + matches[count++] =3D ret; + } + + return count; +} + /** * fwnode_connection_find_match - Find connection from a device node * @fwnode: Device node with the connection @@ -1238,3 +1299,38 @@ void *fwnode_connection_find_match(struct fwnode_han= dle *fwnode, return fwnode_devcon_match(fwnode, con_id, data, match); } EXPORT_SYMBOL_GPL(fwnode_connection_find_match); + +/** + * fwnode_connection_find_matches - Find connections from a device node + * @fwnode: Device node with the connection + * @con_id: Identifier for the connection + * @data: Data for the match function + * @match: Function to check and convert the connection description + * @matches: Array of pointers to fill with matches + * @matches_len: Length of @matches + * + * Find up to @matches_len connections with unique identifier @con_id betw= een + * @fwnode and other device nodes. @match will be used to convert the + * connection description to data the caller is expecting to be returned + * through the @matches array. + * + * Return: Number of matches resolved, of negative errno. + */ +int fwnode_connection_find_matches(struct fwnode_handle *fwnode, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, unsigned int matches_len) +{ + unsigned int count; + + if (!fwnode || !match || !matches) + return -EINVAL; + + count =3D fwnode_graph_devcon_matches(fwnode, con_id, data, match, + matches, matches_len); + + return count + fwnode_devcon_matches(fwnode, con_id, data, match, + matches + count, + matches_len - count); +} +EXPORT_SYMBOL_GPL(fwnode_connection_find_matches); diff --git a/include/linux/property.h b/include/linux/property.h index 7399a0b45f98..aa7ef9d06ebe 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -446,6 +446,11 @@ static inline void *device_connection_find_match(struc= t device *dev, return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match); } =20 +int fwnode_connection_find_matches(struct fwnode_handle *fwnode, + const char *con_id, void *data, + devcon_match_fn_t match, + void **matches, unsigned int matches_len); + /* -----------------------------------------------------------------------= --- */ /* Software fwnode support - when HW description is incomplete or missing = */ =20 --=20 2.33.1 From nobody Mon Jun 29 15:59:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E2C0C433FE for ; Tue, 8 Feb 2022 03:17:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346351AbiBHDRk (ORCPT ); Mon, 7 Feb 2022 22:17:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345050AbiBHDR2 (ORCPT ); Mon, 7 Feb 2022 22:17:28 -0500 Received: from mail-oo1-xc36.google.com (mail-oo1-xc36.google.com [IPv6:2607:f8b0:4864:20::c36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE844C043188 for ; Mon, 7 Feb 2022 19:17:27 -0800 (PST) Received: by mail-oo1-xc36.google.com with SMTP id t75-20020a4a3e4e000000b002e9c0821d78so16139563oot.4 for ; Mon, 07 Feb 2022 19:17:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kylOqxqc08MBshbgqm3PijrB7pXzqxJn31OEqnNLWP0=; b=l2qL6B4M9YlcEtPfHIONnFSylbV2DQVytd1K73tkEYy3cpTU6G8d9pXsvw64D3EO7Y WNZByESzObBZ6nqduWAz84bD8lWTWL6jmIQl/bYfCMBxOGuErmQaeEsTCtJ07PonuvJ4 /Fk6GfmFSwkm76CSKFv41aeJ+gwgCXzF6xHDGmgAdUgA0IzsEdCMY/ktIwwq648MfhdT lGcIo58EYTJY0kLL07zIUYIRh9EH9A9DFX+blLe9pj+9tPrBSUlsE4uMvZhW8xeuq49Q pmxz3seZZQVjtYvQvCDRux/1nNKYiXWKzu1CKccu0T3jkIu6/JS+mK3FZwXUKIKu/PNI 5yeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kylOqxqc08MBshbgqm3PijrB7pXzqxJn31OEqnNLWP0=; b=rFreRqNKlbSibjToc76Be88jHqoT9jj2U76JQLM6FwzXBLsOC0/to1b4AdQNEaCak7 UvaU8+rqTfXFDIOzFTYC43yarMxTRT2duzHZn89O37fmQqjzkwWsmfEfDCj3hUs2nJ4T 4+d0AGp/r4GlmyCd9iMdc7kyGtuZK+1RcdSP8LDIrfgVPBkDmDOM+5XVGZx53tszruls JIetTz8lTRr/pFM+qGReyM9iCQbM3/i9Tcd7FroIdyG8Iyuuni54aQjz76zgKDf2MWJu M+/JCr4HAEgjnRjqssE/OqdjXdnYj2n9T7+nHINuj2MsJ13TXAPDfIewpZT77ZyfNKGA DVdg== X-Gm-Message-State: AOAM5337BTA7O1nYH5D/8MEEsy4iI1Pq38pDeMs88ZBEvnmCAeHyKWNQ PeUsjnSOjkzXtTeO4dAJQxTXPQ== X-Google-Smtp-Source: ABdhPJxrBuzO7d3fd9iENVl5M322rUWPV/E4hg56Lh1fAMr84xr29Rxpr4Qun+vpOi5ftnwzPfTkxQ== X-Received: by 2002:a05:6870:7a13:: with SMTP id hf19mr676576oab.127.1644290247151; Mon, 07 Feb 2022 19:17:27 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id k3sm4763873otl.41.2022.02.07.19.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 19:17:26 -0800 (PST) From: Bjorn Andersson To: Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 2/6] device property: Use multi-connection matchers for single case Date: Mon, 7 Feb 2022 19:19:40 -0800 Message-Id: <20220208031944.3444-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208031944.3444-1-bjorn.andersson@linaro.org> References: <20220208031944.3444-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The newly introduced helpers for searching for matches in the case of multiple connections can be resused by the single-connection case, so do this to save some duplication. Signed-off-by: Bjorn Andersson Tested-by: Hans de Goede --- Changes since v1: - None drivers/base/property.c | 55 ++++------------------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index 5230ff5c8d48..dfdf7164b6de 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1164,31 +1164,6 @@ const void *device_get_match_data(struct device *dev) } EXPORT_SYMBOL_GPL(device_get_match_data); =20 -static void * -fwnode_graph_devcon_match(struct fwnode_handle *fwnode, const char *con_id, - void *data, devcon_match_fn_t match) -{ - struct fwnode_handle *node; - struct fwnode_handle *ep; - void *ret; - - fwnode_graph_for_each_endpoint(fwnode, ep) { - node =3D fwnode_graph_get_remote_port_parent(ep); - if (!fwnode_device_is_available(node)) { - fwnode_handle_put(node); - continue; - } - - ret =3D match(node, con_id, data); - fwnode_handle_put(node); - if (ret) { - fwnode_handle_put(ep); - return ret; - } - } - return NULL; -} - static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwno= de, const char *con_id, void *data, devcon_match_fn_t match, @@ -1221,28 +1196,6 @@ static unsigned int fwnode_graph_devcon_matches(stru= ct fwnode_handle *fwnode, return count; } =20 -static void * -fwnode_devcon_match(struct fwnode_handle *fwnode, const char *con_id, - void *data, devcon_match_fn_t match) -{ - struct fwnode_handle *node; - void *ret; - int i; - - for (i =3D 0; ; i++) { - node =3D fwnode_find_reference(fwnode, con_id, i); - if (IS_ERR(node)) - break; - - ret =3D match(node, NULL, data); - fwnode_handle_put(node); - if (ret) - return ret; - } - - return NULL; -} - static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode, const char *con_id, void *data, devcon_match_fn_t match, @@ -1287,16 +1240,18 @@ void *fwnode_connection_find_match(struct fwnode_ha= ndle *fwnode, const char *con_id, void *data, devcon_match_fn_t match) { + unsigned int count; void *ret; =20 if (!fwnode || !match) return NULL; =20 - ret =3D fwnode_graph_devcon_match(fwnode, con_id, data, match); - if (ret) + count =3D fwnode_graph_devcon_matches(fwnode, con_id, data, match, &ret, = 1); + if (count) return ret; =20 - return fwnode_devcon_match(fwnode, con_id, data, match); + count =3D fwnode_devcon_matches(fwnode, con_id, data, match, &ret, 1); + return count ? ret : NULL; } EXPORT_SYMBOL_GPL(fwnode_connection_find_match); =20 --=20 2.33.1 From nobody Mon Jun 29 15:59:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0AC0C433EF for ; Tue, 8 Feb 2022 03:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346360AbiBHDRn (ORCPT ); Mon, 7 Feb 2022 22:17:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346081AbiBHDRa (ORCPT ); Mon, 7 Feb 2022 22:17:30 -0500 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECF59C043181 for ; Mon, 7 Feb 2022 19:17:28 -0800 (PST) Received: by mail-ot1-x32e.google.com with SMTP id b12-20020a9d754c000000b0059eb935359eso12320751otl.8 for ; Mon, 07 Feb 2022 19:17:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BgnFoW9Bd+KfFIXjGHiGgDWEDVa3/TdwFXQbY0nrTFY=; b=BSOc7VwkiAoRPU/J2eITp+NRdl5mq7PMxWi2YN2Eb2pm/PLOik4UclUM6YONMFvL8D fqUpeTjZRgQd9T/U/4UCMqwjurNLCnatToeIVd1GcHAOtM/895WaZ1uWxax3fa1I8ILl mgSRFXrtCwpCo8ZBZzjxDHkV3/X2x+xLufzalwPqCucge/Gqfk5Aqw89GURVqu63dhty Cmw7V97AY+VS/QIBou19dV+2yVIiQZF9d94gH7jV+wAEBQwWAt0N5QADkcdyFdXeisxW NYr7+qkoqgoKw58+eRSN5/RXQUtLUAlJpnI+PvD4zscfj7Vby5JI6FwEfk/GRx5/04To TZ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BgnFoW9Bd+KfFIXjGHiGgDWEDVa3/TdwFXQbY0nrTFY=; b=Cf9Tx9tHtOwzgr776Y0uIXXFK5yE3YLCJQMIWPsk3jiz5yp4XqlDy6PfSibLq9w7xI Rg6voqd/aDet4w/FDoBCdSRT8IOkbx3X20GL7v2Aa5SdpR7EttpCgxg+TMCSTHeBh2/+ bqRSRibFEcJS6Pi5Zme/SqSXA3phj4BMkrXWA/2vEmPveqnqrW+tR/43Veb6TZJgNt21 TC6fTJIftZ1MwVzaJ4xRslLYnw2OxESs9DDN66srecd7hQP/h/PSEot6M0Truq0CxfBG V3okzXncSw6sbv8UsQpSzSnLp2pvoEm/1DCiBXoR0dkKdsbeVu+bz+LUfLyuEos5HTFf aBKQ== X-Gm-Message-State: AOAM530zT6wpX3gv0x/eIq1SCd5jckAKr+ME4ICExdjr8kaaxyXy5VjK cocmcx9ZzJ9YKzF+O0jV4bdojA== X-Google-Smtp-Source: ABdhPJxE03be/+W5O3PV4Aqnmm8zTLqQIyM+esntLivljyne43zwMuWL6jK07Y3uS7XLhx+pp1yTSA== X-Received: by 2002:a05:6830:1204:: with SMTP id r4mr1134363otp.32.1644290248196; Mon, 07 Feb 2022 19:17:28 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id k3sm4763873otl.41.2022.02.07.19.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 19:17:27 -0800 (PST) From: Bjorn Andersson To: Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 3/6] typec: mux: Introduce indirection Date: Mon, 7 Feb 2022 19:19:41 -0800 Message-Id: <20220208031944.3444-4-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208031944.3444-1-bjorn.andersson@linaro.org> References: <20220208031944.3444-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rather than directly exposing the implementation's representation of the typec muxes to the controller/clients, introduce an indirection object. This enables the introduction of turning this relationship into a one-to-many in the following patch. Signed-off-by: Bjorn Andersson Acked-by: Heikki Krogerus Tested-by: Hans de Goede --- Changes sice v1: - None drivers/usb/typec/bus.c | 2 +- drivers/usb/typec/mux.c | 189 ++++++++++++++++---------- drivers/usb/typec/mux.h | 12 +- drivers/usb/typec/mux/intel_pmc_mux.c | 8 +- drivers/usb/typec/mux/pi3usb30532.c | 8 +- include/linux/usb/typec_mux.h | 22 +-- 6 files changed, 146 insertions(+), 95 deletions(-) diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 78e0e78954f2..26ea2fdec17d 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -24,7 +24,7 @@ typec_altmode_set_mux(struct altmode *alt, unsigned long = conf, void *data) state.mode =3D conf; state.data =3D data; =20 - return alt->mux->set(alt->mux, &state); + return typec_mux_set(alt->mux, &state); } =20 static int typec_altmode_set_state(struct typec_altmode *adev, diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index c8340de0ed49..d0b42c297aca 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -17,9 +17,13 @@ #include "class.h" #include "mux.h" =20 +struct typec_switch { + struct typec_switch_dev *sw_dev; +}; + static int switch_fwnode_match(struct device *dev, const void *fwnode) { - if (!is_typec_switch(dev)) + if (!is_typec_switch_dev(dev)) return 0; =20 return dev_fwnode(dev) =3D=3D fwnode; @@ -49,7 +53,7 @@ static void *typec_switch_match(struct fwnode_handle *fwn= ode, const char *id, dev =3D class_find_device(&typec_mux_class, NULL, fwnode, switch_fwnode_match); =20 - return dev ? to_typec_switch(dev) : ERR_PTR(-EPROBE_DEFER); + return dev ? to_typec_switch_dev(dev) : ERR_PTR(-EPROBE_DEFER); } =20 /** @@ -63,12 +67,23 @@ static void *typec_switch_match(struct fwnode_handle *f= wnode, const char *id, */ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) { + struct typec_switch_dev *sw_dev; struct typec_switch *sw; =20 - sw =3D fwnode_connection_find_match(fwnode, "orientation-switch", NULL, - typec_switch_match); - if (!IS_ERR_OR_NULL(sw)) - WARN_ON(!try_module_get(sw->dev.parent->driver->owner)); + sw =3D kzalloc(sizeof(*sw), GFP_KERNEL); + if (!sw) + return ERR_PTR(-ENOMEM); + + sw_dev =3D fwnode_connection_find_match(fwnode, "orientation-switch", NUL= L, + typec_switch_match); + if (IS_ERR_OR_NULL(sw_dev)) { + kfree(sw); + return ERR_CAST(sw_dev); + } + + WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); + + sw->sw_dev =3D sw_dev; =20 return sw; } @@ -82,16 +97,22 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); */ void typec_switch_put(struct typec_switch *sw) { - if (!IS_ERR_OR_NULL(sw)) { - module_put(sw->dev.parent->driver->owner); - put_device(&sw->dev); - } + struct typec_switch_dev *sw_dev; + + if (IS_ERR_OR_NULL(sw)) + return; + + sw_dev =3D sw->sw_dev; + + module_put(sw_dev->dev.parent->driver->owner); + put_device(&sw_dev->dev); + kfree(sw); } EXPORT_SYMBOL_GPL(typec_switch_put); =20 static void typec_switch_release(struct device *dev) { - kfree(to_typec_switch(dev)); + kfree(to_typec_switch_dev(dev)); } =20 const struct device_type typec_switch_dev_type =3D { @@ -109,82 +130,90 @@ const struct device_type typec_switch_dev_type =3D { * connector to the USB controllers. USB Type-C plugs can be inserted * right-side-up or upside-down. */ -struct typec_switch * +struct typec_switch_dev * typec_switch_register(struct device *parent, const struct typec_switch_desc *desc) { - struct typec_switch *sw; + struct typec_switch_dev *sw_dev; int ret; =20 if (!desc || !desc->set) return ERR_PTR(-EINVAL); =20 - sw =3D kzalloc(sizeof(*sw), GFP_KERNEL); - if (!sw) + sw_dev =3D kzalloc(sizeof(*sw_dev), GFP_KERNEL); + if (!sw_dev) return ERR_PTR(-ENOMEM); =20 - sw->set =3D desc->set; + sw_dev->set =3D desc->set; =20 - device_initialize(&sw->dev); - sw->dev.parent =3D parent; - sw->dev.fwnode =3D desc->fwnode; - sw->dev.class =3D &typec_mux_class; - sw->dev.type =3D &typec_switch_dev_type; - sw->dev.driver_data =3D desc->drvdata; - dev_set_name(&sw->dev, "%s-switch", + device_initialize(&sw_dev->dev); + sw_dev->dev.parent =3D parent; + sw_dev->dev.fwnode =3D desc->fwnode; + sw_dev->dev.class =3D &typec_mux_class; + sw_dev->dev.type =3D &typec_switch_dev_type; + sw_dev->dev.driver_data =3D desc->drvdata; + dev_set_name(&sw_dev->dev, "%s-switch", desc->name ? desc->name : dev_name(parent)); =20 - ret =3D device_add(&sw->dev); + ret =3D device_add(&sw_dev->dev); if (ret) { dev_err(parent, "failed to register switch (%d)\n", ret); - put_device(&sw->dev); + put_device(&sw_dev->dev); return ERR_PTR(ret); } =20 - return sw; + return sw_dev; } EXPORT_SYMBOL_GPL(typec_switch_register); =20 int typec_switch_set(struct typec_switch *sw, enum typec_orientation orientation) { + struct typec_switch_dev *sw_dev; + if (IS_ERR_OR_NULL(sw)) return 0; =20 - return sw->set(sw, orientation); + sw_dev =3D sw->sw_dev; + + return sw_dev->set(sw_dev, orientation); } EXPORT_SYMBOL_GPL(typec_switch_set); =20 /** * typec_switch_unregister - Unregister USB Type-C orientation switch - * @sw: USB Type-C orientation switch + * @sw_dev: USB Type-C orientation switch * * Unregister switch that was registered with typec_switch_register(). */ -void typec_switch_unregister(struct typec_switch *sw) +void typec_switch_unregister(struct typec_switch_dev *sw_dev) { - if (!IS_ERR_OR_NULL(sw)) - device_unregister(&sw->dev); + if (!IS_ERR_OR_NULL(sw_dev)) + device_unregister(&sw_dev->dev); } EXPORT_SYMBOL_GPL(typec_switch_unregister); =20 -void typec_switch_set_drvdata(struct typec_switch *sw, void *data) +void typec_switch_set_drvdata(struct typec_switch_dev *sw_dev, void *data) { - dev_set_drvdata(&sw->dev, data); + dev_set_drvdata(&sw_dev->dev, data); } EXPORT_SYMBOL_GPL(typec_switch_set_drvdata); =20 -void *typec_switch_get_drvdata(struct typec_switch *sw) +void *typec_switch_get_drvdata(struct typec_switch_dev *sw_dev) { - return dev_get_drvdata(&sw->dev); + return dev_get_drvdata(&sw_dev->dev); } EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); =20 /* -----------------------------------------------------------------------= -- */ =20 +struct typec_mux { + struct typec_mux_dev *mux_dev; +}; + static int mux_fwnode_match(struct device *dev, const void *fwnode) { - if (!is_typec_mux(dev)) + if (!is_typec_mux_dev(dev)) return 0; =20 return dev_fwnode(dev) =3D=3D fwnode; @@ -246,7 +275,7 @@ static void *typec_mux_match(struct fwnode_handle *fwno= de, const char *id, dev =3D class_find_device(&typec_mux_class, NULL, fwnode, mux_fwnode_match); =20 - return dev ? to_typec_mux(dev) : ERR_PTR(-EPROBE_DEFER); + return dev ? to_typec_mux_dev(dev) : ERR_PTR(-EPROBE_DEFER); } =20 /** @@ -262,12 +291,23 @@ static void *typec_mux_match(struct fwnode_handle *fw= node, const char *id, struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc) { + struct typec_mux_dev *mux_dev; struct typec_mux *mux; =20 - mux =3D fwnode_connection_find_match(fwnode, "mode-switch", (void *)desc, - typec_mux_match); - if (!IS_ERR_OR_NULL(mux)) - WARN_ON(!try_module_get(mux->dev.parent->driver->owner)); + mux =3D kzalloc(sizeof(*mux), GFP_KERNEL); + if (!mux) + return ERR_PTR(-ENOMEM); + + mux_dev =3D fwnode_connection_find_match(fwnode, "mode-switch", (void *)d= esc, + typec_mux_match); + if (IS_ERR_OR_NULL(mux_dev)) { + kfree(mux); + return ERR_CAST(mux_dev); + } + + WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); + + mux->mux_dev =3D mux_dev; =20 return mux; } @@ -281,25 +321,34 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); */ void typec_mux_put(struct typec_mux *mux) { - if (!IS_ERR_OR_NULL(mux)) { - module_put(mux->dev.parent->driver->owner); - put_device(&mux->dev); - } + struct typec_mux_dev *mux_dev; + + if (IS_ERR_OR_NULL(mux)) + return; + + mux_dev =3D mux->mux_dev; + module_put(mux_dev->dev.parent->driver->owner); + put_device(&mux_dev->dev); + kfree(mux); } EXPORT_SYMBOL_GPL(typec_mux_put); =20 int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) { + struct typec_mux_dev *mux_dev; + if (IS_ERR_OR_NULL(mux)) return 0; =20 - return mux->set(mux, state); + mux_dev =3D mux->mux_dev; + + return mux_dev->set(mux_dev, state); } EXPORT_SYMBOL_GPL(typec_mux_set); =20 static void typec_mux_release(struct device *dev) { - kfree(to_typec_mux(dev)); + kfree(to_typec_mux_dev(dev)); } =20 const struct device_type typec_mux_dev_type =3D { @@ -317,63 +366,63 @@ const struct device_type typec_mux_dev_type =3D { * the pins on the connector need to be reconfigured. This function regist= ers * multiplexer switches routing the pins on the connector. */ -struct typec_mux * +struct typec_mux_dev * typec_mux_register(struct device *parent, const struct typec_mux_desc *des= c) { - struct typec_mux *mux; + struct typec_mux_dev *mux_dev; int ret; =20 if (!desc || !desc->set) return ERR_PTR(-EINVAL); =20 - mux =3D kzalloc(sizeof(*mux), GFP_KERNEL); - if (!mux) + mux_dev =3D kzalloc(sizeof(*mux_dev), GFP_KERNEL); + if (!mux_dev) return ERR_PTR(-ENOMEM); =20 - mux->set =3D desc->set; + mux_dev->set =3D desc->set; =20 - device_initialize(&mux->dev); - mux->dev.parent =3D parent; - mux->dev.fwnode =3D desc->fwnode; - mux->dev.class =3D &typec_mux_class; - mux->dev.type =3D &typec_mux_dev_type; - mux->dev.driver_data =3D desc->drvdata; - dev_set_name(&mux->dev, "%s-mux", + device_initialize(&mux_dev->dev); + mux_dev->dev.parent =3D parent; + mux_dev->dev.fwnode =3D desc->fwnode; + mux_dev->dev.class =3D &typec_mux_class; + mux_dev->dev.type =3D &typec_mux_dev_type; + mux_dev->dev.driver_data =3D desc->drvdata; + dev_set_name(&mux_dev->dev, "%s-mux", desc->name ? desc->name : dev_name(parent)); =20 - ret =3D device_add(&mux->dev); + ret =3D device_add(&mux_dev->dev); if (ret) { dev_err(parent, "failed to register mux (%d)\n", ret); - put_device(&mux->dev); + put_device(&mux_dev->dev); return ERR_PTR(ret); } =20 - return mux; + return mux_dev; } EXPORT_SYMBOL_GPL(typec_mux_register); =20 /** * typec_mux_unregister - Unregister Multiplexer Switch - * @mux: USB Type-C Connector Multiplexer/DeMultiplexer + * @mux_dev: USB Type-C Connector Multiplexer/DeMultiplexer * * Unregister mux that was registered with typec_mux_register(). */ -void typec_mux_unregister(struct typec_mux *mux) +void typec_mux_unregister(struct typec_mux_dev *mux_dev) { - if (!IS_ERR_OR_NULL(mux)) - device_unregister(&mux->dev); + if (!IS_ERR_OR_NULL(mux_dev)) + device_unregister(&mux_dev->dev); } EXPORT_SYMBOL_GPL(typec_mux_unregister); =20 -void typec_mux_set_drvdata(struct typec_mux *mux, void *data) +void typec_mux_set_drvdata(struct typec_mux_dev *mux_dev, void *data) { - dev_set_drvdata(&mux->dev, data); + dev_set_drvdata(&mux_dev->dev, data); } EXPORT_SYMBOL_GPL(typec_mux_set_drvdata); =20 -void *typec_mux_get_drvdata(struct typec_mux *mux) +void *typec_mux_get_drvdata(struct typec_mux_dev *mux_dev) { - return dev_get_drvdata(&mux->dev); + return dev_get_drvdata(&mux_dev->dev); } EXPORT_SYMBOL_GPL(typec_mux_get_drvdata); =20 diff --git a/drivers/usb/typec/mux.h b/drivers/usb/typec/mux.h index b1d6e837cb74..58f0f28b6dc8 100644 --- a/drivers/usb/typec/mux.h +++ b/drivers/usb/typec/mux.h @@ -5,23 +5,23 @@ =20 #include =20 -struct typec_switch { +struct typec_switch_dev { struct device dev; typec_switch_set_fn_t set; }; =20 -struct typec_mux { +struct typec_mux_dev { struct device dev; typec_mux_set_fn_t set; }; =20 -#define to_typec_switch(_dev_) container_of(_dev_, struct typec_switch, de= v) -#define to_typec_mux(_dev_) container_of(_dev_, struct typec_mux, dev) +#define to_typec_switch_dev(_dev_) container_of(_dev_, struct typec_switch= _dev, dev) +#define to_typec_mux_dev(_dev_) container_of(_dev_, struct typec_mux_dev, = dev) =20 extern const struct device_type typec_switch_dev_type; extern const struct device_type typec_mux_dev_type; =20 -#define is_typec_switch(dev) ((dev)->type =3D=3D &typec_switch_dev_type) -#define is_typec_mux(dev) ((dev)->type =3D=3D &typec_mux_dev_type) +#define is_typec_switch_dev(dev) ((dev)->type =3D=3D &typec_switch_dev_typ= e) +#define is_typec_mux_dev(dev) ((dev)->type =3D=3D &typec_mux_dev_type) =20 #endif /* __USB_TYPEC_MUX__ */ diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/= intel_pmc_mux.c index 2cdd22130834..51d8f3b88128 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -121,8 +121,8 @@ struct pmc_usb_port { int num; u32 iom_status; struct pmc_usb *pmc; - struct typec_mux *typec_mux; - struct typec_switch *typec_sw; + struct typec_mux_dev *typec_mux; + struct typec_switch_dev *typec_sw; struct usb_role_switch *usb_sw; =20 enum typec_orientation orientation; @@ -416,7 +416,7 @@ static int pmc_usb_connect(struct pmc_usb_port *port, e= num usb_role role) } =20 static int -pmc_usb_mux_set(struct typec_mux *mux, struct typec_mux_state *state) +pmc_usb_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state) { struct pmc_usb_port *port =3D typec_mux_get_drvdata(mux); =20 @@ -452,7 +452,7 @@ pmc_usb_mux_set(struct typec_mux *mux, struct typec_mux= _state *state) return -EOPNOTSUPP; } =20 -static int pmc_usb_set_orientation(struct typec_switch *sw, +static int pmc_usb_set_orientation(struct typec_switch_dev *sw, enum typec_orientation orientation) { struct pmc_usb_port *port =3D typec_switch_get_drvdata(sw); diff --git a/drivers/usb/typec/mux/pi3usb30532.c b/drivers/usb/typec/mux/pi= 3usb30532.c index 7afe275b17d0..6ce9f282594e 100644 --- a/drivers/usb/typec/mux/pi3usb30532.c +++ b/drivers/usb/typec/mux/pi3usb30532.c @@ -23,8 +23,8 @@ struct pi3usb30532 { struct i2c_client *client; struct mutex lock; /* protects the cached conf register */ - struct typec_switch *sw; - struct typec_mux *mux; + struct typec_switch_dev *sw; + struct typec_mux_dev *mux; u8 conf; }; =20 @@ -45,7 +45,7 @@ static int pi3usb30532_set_conf(struct pi3usb30532 *pi, u= 8 new_conf) return 0; } =20 -static int pi3usb30532_sw_set(struct typec_switch *sw, +static int pi3usb30532_sw_set(struct typec_switch_dev *sw, enum typec_orientation orientation) { struct pi3usb30532 *pi =3D typec_switch_get_drvdata(sw); @@ -74,7 +74,7 @@ static int pi3usb30532_sw_set(struct typec_switch *sw, } =20 static int -pi3usb30532_mux_set(struct typec_mux *mux, struct typec_mux_state *state) +pi3usb30532_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *sta= te) { struct pi3usb30532 *pi =3D typec_mux_get_drvdata(mux); u8 new_conf; diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h index a9d9957933dc..ee57781dcf28 100644 --- a/include/linux/usb/typec_mux.h +++ b/include/linux/usb/typec_mux.h @@ -8,11 +8,13 @@ =20 struct device; struct typec_mux; +struct typec_mux_dev; struct typec_switch; +struct typec_switch_dev; struct typec_altmode; struct fwnode_handle; =20 -typedef int (*typec_switch_set_fn_t)(struct typec_switch *sw, +typedef int (*typec_switch_set_fn_t)(struct typec_switch_dev *sw, enum typec_orientation orientation); =20 struct typec_switch_desc { @@ -32,13 +34,13 @@ static inline struct typec_switch *typec_switch_get(str= uct device *dev) return fwnode_typec_switch_get(dev_fwnode(dev)); } =20 -struct typec_switch * +struct typec_switch_dev * typec_switch_register(struct device *parent, const struct typec_switch_desc *desc); -void typec_switch_unregister(struct typec_switch *sw); +void typec_switch_unregister(struct typec_switch_dev *sw); =20 -void typec_switch_set_drvdata(struct typec_switch *sw, void *data); -void *typec_switch_get_drvdata(struct typec_switch *sw); +void typec_switch_set_drvdata(struct typec_switch_dev *sw, void *data); +void *typec_switch_get_drvdata(struct typec_switch_dev *sw); =20 struct typec_mux_state { struct typec_altmode *alt; @@ -46,7 +48,7 @@ struct typec_mux_state { void *data; }; =20 -typedef int (*typec_mux_set_fn_t)(struct typec_mux *mux, +typedef int (*typec_mux_set_fn_t)(struct typec_mux_dev *mux, struct typec_mux_state *state); =20 struct typec_mux_desc { @@ -67,11 +69,11 @@ typec_mux_get(struct device *dev, const struct typec_al= tmode_desc *desc) return fwnode_typec_mux_get(dev_fwnode(dev), desc); } =20 -struct typec_mux * +struct typec_mux_dev * typec_mux_register(struct device *parent, const struct typec_mux_desc *des= c); -void typec_mux_unregister(struct typec_mux *mux); +void typec_mux_unregister(struct typec_mux_dev *mux); =20 -void typec_mux_set_drvdata(struct typec_mux *mux, void *data); -void *typec_mux_get_drvdata(struct typec_mux *mux); +void typec_mux_set_drvdata(struct typec_mux_dev *mux, void *data); +void *typec_mux_get_drvdata(struct typec_mux_dev *mux); =20 #endif /* __USB_TYPEC_MUX */ --=20 2.33.1 From nobody Mon Jun 29 15:59:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEC96C433F5 for ; Tue, 8 Feb 2022 03:17:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346527AbiBHDRz (ORCPT ); Mon, 7 Feb 2022 22:17:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346325AbiBHDRf (ORCPT ); Mon, 7 Feb 2022 22:17:35 -0500 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C946AC0401DB for ; Mon, 7 Feb 2022 19:17:29 -0800 (PST) Received: by mail-oi1-x234.google.com with SMTP id m10so19246608oie.2 for ; Mon, 07 Feb 2022 19:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bsQuLODdWm1Cnle/5fLWtpNZXzsfiq8FA4ZXWSUjJqg=; b=gQXH0xSlRqr67+285X7EwKPz6rsu+a2ASpaXOlZTnPNoRoa2hzF0O08ZoOJ9ApOy5h k95Insj0nCsSnt11pVjeY8Q+SjvEUOuhoLR1fOLynZUZptXBf3e0IHK7z0jHkixZbxdw UN/cZ9jEG5shXKOKjHj/8+0jFaqVSySlOlCHHkC2FLsmNSjb+pC9BQ64Ic0ujgV0j/6r WjMUJXcaKZ3dAnhioaD13Wpv+BjmTSYml5QJSi0RjhDl3JLFVJUh7mNAijVTshy/LICK DrLJYNI88T0WZQ9s90ExZi0R2eBvv9KI01nr7COiNtqDW+txkpwRfrBqWAKo2XXds97C rZyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bsQuLODdWm1Cnle/5fLWtpNZXzsfiq8FA4ZXWSUjJqg=; b=tK0kmTlELOBkeeM4gKi7appdmwswxv67xV61JxOHtCxX4m1vjwauA+6kvtd+MQ79BZ lyyD7tR4ejsaX5CWeqJxpDakJRj1IQbRhsuTfDXtwQevYyP16dOarHDmseccyRJ38cl5 F0x8ylNrNsGPDXOnx0/s0zUOiN6XgKA0Y6t1OYXTN0JhC09RnWDF6q0+7i87MtgSS/Wn CInB7h+jMUQfaD6T4sVDkeoRvT6AZMwFB8A+U6Xvl/v4kSfmfzz302SoCWKGRqcQHv/r HsCBsSvPa8PkbWqlRwyKekbqUfWPddnYyry884/tNZJqbSczSWUUi1R1jzDRA2n+b6/2 pNbg== X-Gm-Message-State: AOAM531cpIPltfLKNqiAjjPnG6r67YKRSPoCXot9rKV1yt6F8WEzx28I XdDMu40Nft3UyMse0J2FrTFzdjAuRc6k5A== X-Google-Smtp-Source: ABdhPJx0VDhy008Xogb8mxVScsVskFyE8zUSZv5J5++LTW8thrKh5eflOu30zUCmClwNtLhoVgAodA== X-Received: by 2002:a05:6808:bc8:: with SMTP id o8mr902150oik.16.1644290249163; Mon, 07 Feb 2022 19:17:29 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id k3sm4763873otl.41.2022.02.07.19.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 19:17:28 -0800 (PST) From: Bjorn Andersson To: Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 4/6] typec: mux: Allow multiple mux_devs per mux Date: Mon, 7 Feb 2022 19:19:42 -0800 Message-Id: <20220208031944.3444-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208031944.3444-1-bjorn.andersson@linaro.org> References: <20220208031944.3444-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the Qualcomm platforms the USB/DP PHY handles muxing and orientation switching of the SuperSpeed lines, but the SBU lines needs to be connected and switched by external (to the SoC) hardware. It's therefor necessary to be able to have the TypeC controller operate multiple TypeC muxes and switches. Use the newly introduced indirection object to handle this, to avoid having to taint the TypeC controllers with knowledge about the downstream hardware configuration. The max number of devs per indirection is set to 3, which account for being able to mux/switch the USB HS, SS and SBU lines, as per defined defined in the usb-c-connector binding. This number could be grown if need arrises at a later point in time. Signed-off-by: Bjorn Andersson Tested-by: Hans de Goede --- Changes since v1: - Improved the motivation for the 3 in the commit message. - kfree sw and mux in error paths drivers/usb/typec/mux.c | 128 ++++++++++++++++++++++++++++++++-------- 1 file changed, 102 insertions(+), 26 deletions(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index d0b42c297aca..cf2347dd1663 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -17,8 +17,11 @@ #include "class.h" #include "mux.h" =20 +#define TYPEC_MUX_MAX_DEVS 3 + struct typec_switch { - struct typec_switch_dev *sw_dev; + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; + unsigned int num_sw_devs; }; =20 static int switch_fwnode_match(struct device *dev, const void *fwnode) @@ -67,25 +70,50 @@ static void *typec_switch_match(struct fwnode_handle *f= wnode, const char *id, */ struct typec_switch *fwnode_typec_switch_get(struct fwnode_handle *fwnode) { - struct typec_switch_dev *sw_dev; + struct typec_switch_dev *sw_devs[TYPEC_MUX_MAX_DEVS]; struct typec_switch *sw; + int count; + int err; + int i; =20 sw =3D kzalloc(sizeof(*sw), GFP_KERNEL); if (!sw) return ERR_PTR(-ENOMEM); =20 - sw_dev =3D fwnode_connection_find_match(fwnode, "orientation-switch", NUL= L, - typec_switch_match); - if (IS_ERR_OR_NULL(sw_dev)) { + count =3D fwnode_connection_find_matches(fwnode, "orientation-switch", NU= LL, + typec_switch_match, + (void **)sw_devs, + ARRAY_SIZE(sw_devs)); + if (count <=3D 0) { kfree(sw); - return ERR_CAST(sw_dev); + return NULL; } =20 - WARN_ON(!try_module_get(sw_dev->dev.parent->driver->owner)); + for (i =3D 0; i < count; i++) { + if (IS_ERR(sw_devs[i])) { + err =3D PTR_ERR(sw_devs[i]); + goto put_sw_devs; + } + } =20 - sw->sw_dev =3D sw_dev; + for (i =3D 0; i < count; i++) { + WARN_ON(!try_module_get(sw_devs[i]->dev.parent->driver->owner)); + sw->sw_devs[i] =3D sw_devs[i]; + } + + sw->num_sw_devs =3D count; =20 return sw; + +put_sw_devs: + for (i =3D 0; i < count; i++) { + if (!IS_ERR(sw_devs[i])) + put_device(&sw_devs[i]->dev); + } + + kfree(sw); + + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); =20 @@ -98,14 +126,17 @@ EXPORT_SYMBOL_GPL(fwnode_typec_switch_get); void typec_switch_put(struct typec_switch *sw) { struct typec_switch_dev *sw_dev; + unsigned int i; =20 if (IS_ERR_OR_NULL(sw)) return; =20 - sw_dev =3D sw->sw_dev; + for (i =3D 0; i < sw->num_sw_devs; i++) { + sw_dev =3D sw->sw_devs[i]; =20 - module_put(sw_dev->dev.parent->driver->owner); - put_device(&sw_dev->dev); + module_put(sw_dev->dev.parent->driver->owner); + put_device(&sw_dev->dev); + } kfree(sw); } EXPORT_SYMBOL_GPL(typec_switch_put); @@ -170,13 +201,21 @@ int typec_switch_set(struct typec_switch *sw, enum typec_orientation orientation) { struct typec_switch_dev *sw_dev; + unsigned int i; + int ret; =20 if (IS_ERR_OR_NULL(sw)) return 0; =20 - sw_dev =3D sw->sw_dev; + for (i =3D 0; i < sw->num_sw_devs; i++) { + sw_dev =3D sw->sw_devs[i]; + + ret =3D sw_dev->set(sw_dev, orientation); + if (ret) + return ret; + } =20 - return sw_dev->set(sw_dev, orientation); + return 0; } EXPORT_SYMBOL_GPL(typec_switch_set); =20 @@ -208,7 +247,8 @@ EXPORT_SYMBOL_GPL(typec_switch_get_drvdata); /* -----------------------------------------------------------------------= -- */ =20 struct typec_mux { - struct typec_mux_dev *mux_dev; + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; + unsigned int num_mux_devs; }; =20 static int mux_fwnode_match(struct device *dev, const void *fwnode) @@ -291,25 +331,50 @@ static void *typec_mux_match(struct fwnode_handle *fw= node, const char *id, struct typec_mux *fwnode_typec_mux_get(struct fwnode_handle *fwnode, const struct typec_altmode_desc *desc) { - struct typec_mux_dev *mux_dev; + struct typec_mux_dev *mux_devs[TYPEC_MUX_MAX_DEVS]; struct typec_mux *mux; + int count; + int err; + int i; =20 mux =3D kzalloc(sizeof(*mux), GFP_KERNEL); if (!mux) return ERR_PTR(-ENOMEM); =20 - mux_dev =3D fwnode_connection_find_match(fwnode, "mode-switch", (void *)d= esc, - typec_mux_match); - if (IS_ERR_OR_NULL(mux_dev)) { + count =3D fwnode_connection_find_matches(fwnode, "mode-switch", + (void *)desc, typec_mux_match, + (void **)mux_devs, + ARRAY_SIZE(mux_devs)); + if (count <=3D 0) { kfree(mux); - return ERR_CAST(mux_dev); + return NULL; } =20 - WARN_ON(!try_module_get(mux_dev->dev.parent->driver->owner)); + for (i =3D 0; i < count; i++) { + if (IS_ERR(mux_devs[i])) { + err =3D PTR_ERR(mux_devs[i]); + goto put_mux_devs; + } + } + + for (i =3D 0; i < count; i++) { + WARN_ON(!try_module_get(mux_devs[i]->dev.parent->driver->owner)); + mux->mux_devs[i] =3D mux_devs[i]; + } =20 - mux->mux_dev =3D mux_dev; + mux->num_mux_devs =3D count; =20 return mux; + +put_mux_devs: + for (i =3D 0; i < count; i++) { + if (!IS_ERR(mux_devs[i])) + put_device(&mux_devs[i]->dev); + } + + kfree(mux); + + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); =20 @@ -322,13 +387,16 @@ EXPORT_SYMBOL_GPL(fwnode_typec_mux_get); void typec_mux_put(struct typec_mux *mux) { struct typec_mux_dev *mux_dev; + unsigned int i; =20 if (IS_ERR_OR_NULL(mux)) return; =20 - mux_dev =3D mux->mux_dev; - module_put(mux_dev->dev.parent->driver->owner); - put_device(&mux_dev->dev); + for (i =3D 0; i < mux->num_mux_devs; i++) { + mux_dev =3D mux->mux_devs[i]; + module_put(mux_dev->dev.parent->driver->owner); + put_device(&mux_dev->dev); + } kfree(mux); } EXPORT_SYMBOL_GPL(typec_mux_put); @@ -336,13 +404,21 @@ EXPORT_SYMBOL_GPL(typec_mux_put); int typec_mux_set(struct typec_mux *mux, struct typec_mux_state *state) { struct typec_mux_dev *mux_dev; + unsigned int i; + int ret; =20 if (IS_ERR_OR_NULL(mux)) return 0; =20 - mux_dev =3D mux->mux_dev; + for (i =3D 0; i < mux->num_mux_devs; i++) { + mux_dev =3D mux->mux_devs[i]; + + ret =3D mux_dev->set(mux_dev, state); + if (ret) + return ret; + } =20 - return mux_dev->set(mux_dev, state); + return 0; } EXPORT_SYMBOL_GPL(typec_mux_set); =20 --=20 2.33.1 From nobody Mon Jun 29 15:59:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54A83C433EF for ; Tue, 8 Feb 2022 03:18:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346386AbiBHDR7 (ORCPT ); Mon, 7 Feb 2022 22:17:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346343AbiBHDRf (ORCPT ); Mon, 7 Feb 2022 22:17:35 -0500 Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 584E6C0401E6 for ; Mon, 7 Feb 2022 19:17:31 -0800 (PST) Received: by mail-oo1-xc35.google.com with SMTP id k13-20020a4a948d000000b003172f2f6bdfso10739935ooi.1 for ; Mon, 07 Feb 2022 19:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OTRVq8PpVu//vt/IgzSV5+XNtw1vJPrl7jfHJ1N1q2k=; b=CQzvhJ6+adAFGsOiX5Pabvae50+/HQzV8PZdM3khyC1ZKPPCo8onTNmo9XXHCIM/HF 1iU8vR/mBQ/wKLKl8Ghdnj/GBXAkdfAKRx/txUqyCaEsqN9nLSSsVN/EzX2CAgFBy8HB KHr73C8YAj+cH7aJFLMbV/0N0840/wexW+/KsPUQTwCLvpBZpRyHCr7qKqAV8asMKMjU xjmtBp3tyVO1EMZy3ALxJQGNuncGQItLEJu0P87Xre5qbbnlR6n1ud0hI9vcBSvdc05J p352wrsJB6RpQUMWL9at9BGeew5zrPj+9TesT7eAAfyvsSSCBJN8uNspU7sXHs0G1/5l QrlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OTRVq8PpVu//vt/IgzSV5+XNtw1vJPrl7jfHJ1N1q2k=; b=hff4xqFDkd2ej81LuFaVMXZj44RmQdEPr5ilJRJYyfUHCJFk5VxYGnnSJtM1aqhwXi 1OrMgOipqTopYsOzcM/Jy/4Mm4TRLlOHqBzE9iBhKc/7UimvqkU3NKwNuwJvxI9meR7N rRUJc6763SRlSf5WmdJKJa+cX14jNb383ban4mUrALtXff+97PkUFzdAQHNxviuTAVIm wnzzpTMJxzRRszkhgorqJztwiRmeARc9ppEDuGOoUw3HeoL2NNXGXAnssd765VULl+w3 Qkr/v51V9OBKOn4PZtg4GBOBWkFPvK1yzrhmNh4ENGqn/ROeHW0JDXWlNF7+H2vVxmlZ +AYg== X-Gm-Message-State: AOAM530Wm4Uw44TI1e14J+Jz1ZWEnEm+nv5tQqgfEMtOARtsH0Nvc8Yk vzCwFVAzO6YAlpkmeB8a2tLsgA== X-Google-Smtp-Source: ABdhPJwf9Oa/yS/n5v8HciTRVxjeWulvkF+DJYvLjcsaThC/MGhg+d4EzOLcmscaNUI4nXkN4u+fkQ== X-Received: by 2002:a05:6870:9511:: with SMTP id u17mr684972oal.300.1644290250381; Mon, 07 Feb 2022 19:17:30 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id k3sm4763873otl.41.2022.02.07.19.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 19:17:29 -0800 (PST) From: Bjorn Andersson To: Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 5/6] dt-bindings: usb: Add binding for fcs,fsa4480 Date: Mon, 7 Feb 2022 19:19:43 -0800 Message-Id: <20220208031944.3444-6-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208031944.3444-1-bjorn.andersson@linaro.org> References: <20220208031944.3444-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Fairchild/ON Semiconductor FSA4480 Analog Audio switch is used in USB Type-C configurations for muxing analog audio onto the USB connector, and as such used to control the SBU signals for altmodes such as DisplayPort. Add a binding for this hardware block. Signed-off-by: Bjorn Andersson Tested-by: Hans de Goede --- Changes since v1: - None .../devicetree/bindings/usb/fcs,fsa4480.yaml | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml diff --git a/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml b/Docum= entation/devicetree/bindings/usb/fcs,fsa4480.yaml new file mode 100644 index 000000000000..9473f26b0621 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/fcs,fsa4480.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/usb/fcs,fsa4480.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: ON Semiconductor Analog Audio Switch + +maintainers: + - Bjorn Andersson + +properties: + compatible: + enum: + - fcs,fsa4480 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + vcc-supply: + description: power supply (2.7V-5.5V) + + mode-switch: + description: Flag the port as possible handle of altmode switching + type: boolean + + orientation-switch: + description: Flag the port as possible handler of orientation switching + type: boolean + + port: + $ref: /schemas/graph.yaml#/properties/port + description: + A port node to link the FSA4480 to a TypeC controller for the purpos= e of + handling altmode muxing and orientation switching. + +required: + - compatible + - reg + - port + +additionalProperties: false + +examples: + - | + #include + i2c13 { + #address-cells =3D <1>; + #size-cells =3D <0>; + + fsa4480@42 { + compatible =3D "fcs,fsa4480"; + reg =3D <0x42>; + + interrupts-extended =3D <&tlmm 2 IRQ_TYPE_LEVEL_LOW>; + + vcc-supply =3D <&vreg_bob>; + + mode-switch; + orientation-switch; + + port { + fsa4480_ept: endpoint { + remote-endpoint =3D <&typec_controller>; + }; + }; + }; + }; +... --=20 2.33.1 From nobody Mon Jun 29 15:59:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C72E1C433F5 for ; Tue, 8 Feb 2022 03:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346565AbiBHDSG (ORCPT ); Mon, 7 Feb 2022 22:18:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346366AbiBHDRx (ORCPT ); Mon, 7 Feb 2022 22:17:53 -0500 Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26C43C0401EB for ; Mon, 7 Feb 2022 19:17:32 -0800 (PST) Received: by mail-oi1-x22d.google.com with SMTP id s185so19214711oie.3 for ; Mon, 07 Feb 2022 19:17:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rAkLb8/VLoPikmVZa34Mu//UHelRyndDtvFYFl2OKto=; b=iue8bSzTyvdjYeZNzqAXnDaHjza4sHPBnesVkgjWZLuMUDe+yr/N/sbOlRyENvBF0N 1TXyMUBIJCcvIXhC4O0pb6umZfg05Hn3o9IYpuJaLrXT63GGikEjE5S/vpIyTQa0tcSv JKB+cJuu41+Dq2zfZaGhSlRY8/2Hr8muFNDmzFFddx+JPCbNnhtDVnk6OUyBlvQOg+l2 VZDvUeUu0F1I/ZX9Yr7w99RojcK4zICZ3HzK5qhZnm3E/VtpxR2Ovrzz4jfQj7AnDb03 kBOjv2mecGdtYKeNE/33+sBqHQrdjwWwBHOEdFqtuk8y7VPfQYNOjE5G1ghdpIwI7D9R taSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rAkLb8/VLoPikmVZa34Mu//UHelRyndDtvFYFl2OKto=; b=Um9GZr4UuJrPl8Nnq2bEoch12uJaBKVS1wjwA4BlerHtynPNC8wSQq+7G9r4LRGI75 m2aeiKId6hdK4cAB3wL15awLGLZj9Gdoo7SKvCWoDKCg4n9soCtUPCEjXEKAhJKJCGNW z9Ulm/nGAnvwcUkG1tlbo+hjZuU7rqCN3mECglBRzv6VcTG2VhGXdSE8FU/d8aVXCY6G L+n0KDclg+cjCYSO3M7BdE/axGyuWL+RWPybw2N0hS2ES1IzVvIvVy52zKkYGgVsUpe7 ut4F91DacqM1BvNts1sV8lpuVHRXEBg9HMwr9yvylQxMQgWdbZJvIGKa/BtDrw45kRpa YHEQ== X-Gm-Message-State: AOAM533ODsfq9KajT1vmOedPqd2ncfxf5G3ji40KFeUrcl4GjR2h8Pv4 FUDwUzAQfOQtSEYli8VTw7uSpQ== X-Google-Smtp-Source: ABdhPJzNScp8RSuMivte4BOUF9bsgowytVv6vzXMOktBX2aPf5BU+EgqYmoBW+BI9wUwTz9qbjOPlA== X-Received: by 2002:aca:eb55:: with SMTP id j82mr879492oih.134.1644290251402; Mon, 07 Feb 2022 19:17:31 -0800 (PST) Received: from ripper.. ([2600:1700:a0:3dc8:205:1bff:fec0:b9b3]) by smtp.gmail.com with ESMTPSA id k3sm4763873otl.41.2022.02.07.19.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 19:17:30 -0800 (PST) From: Bjorn Andersson To: Rob Herring , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Hans de Goede Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Dmitry Baryshkov Subject: [PATCH v2 6/6] usb: typec: mux: Add On Semi fsa4480 driver Date: Mon, 7 Feb 2022 19:19:44 -0800 Message-Id: <20220208031944.3444-7-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220208031944.3444-1-bjorn.andersson@linaro.org> References: <20220208031944.3444-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ON Semiconductor FSA4480 is a USB Type-C port multimedia switch with support for analog audio headsets. It allows sharing a common USB Type-C port to pass USB2.0 signal, analog audio, sideband use wires and analog microphone signal. Due to lacking upstream audio support for testing, the audio muxing is left untouched, but implementation of muxing the SBU lines is provided as a pair of TypeC mux and switch devices. This provides the necessary support for enabling the DisplayPort altmode on devices with this circuit. Signed-off-by: Bjorn Andersson Tested-by: Hans de Goede --- Changes since v1: - None drivers/usb/typec/mux/Kconfig | 9 ++ drivers/usb/typec/mux/Makefile | 1 + drivers/usb/typec/mux/fsa4480.c | 220 ++++++++++++++++++++++++++++++++ 3 files changed, 230 insertions(+) create mode 100644 drivers/usb/typec/mux/fsa4480.c diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig index edead555835e..5e20112c3f51 100644 --- a/drivers/usb/typec/mux/Kconfig +++ b/drivers/usb/typec/mux/Kconfig @@ -2,6 +2,15 @@ =20 menu "USB Type-C Multiplexer/DeMultiplexer Switch support" =20 +config TYPEC_MUX_FSA4480 + tristate "ON Semi FSA4480 Analog Audio Switch driver" + depends on I2C + select REGMAP_I2C + help + Driver for the ON Semiconductor FSA4480 Analog Audio Switch, which + provides support for muxing analog audio and sideband signals on a + common USB Type-C connector. + config TYPEC_MUX_PI3USB30532 tristate "Pericom PI3USB30532 Type-C cross switch driver" depends on I2C diff --git a/drivers/usb/typec/mux/Makefile b/drivers/usb/typec/mux/Makefile index 280a6f553115..e52a56c16bfb 100644 --- a/drivers/usb/typec/mux/Makefile +++ b/drivers/usb/typec/mux/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 =20 +obj-$(CONFIG_TYPEC_MUX_FSA4480) +=3D fsa4480.o obj-$(CONFIG_TYPEC_MUX_PI3USB30532) +=3D pi3usb30532.o obj-$(CONFIG_TYPEC_MUX_INTEL_PMC) +=3D intel_pmc_mux.o diff --git a/drivers/usb/typec/mux/fsa4480.c b/drivers/usb/typec/mux/fsa448= 0.c new file mode 100644 index 000000000000..ac2d8648db6a --- /dev/null +++ b/drivers/usb/typec/mux/fsa4480.c @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2021 Linaro Ltd. + * Copyright (C) 2018-2020 The Linux Foundation + */ + +#include +#include +#include +#include +#include +#include +#include + +#define FSA4480_SWITCH_ENABLE 0x04 +#define FSA4480_SWITCH_SELECT 0x05 +#define FSA4480_SWITCH_STATUS1 0x07 +#define FSA4480_SLOW_L 0x08 +#define FSA4480_SLOW_R 0x09 +#define FSA4480_SLOW_MIC 0x0a +#define FSA4480_SLOW_SENSE 0x0b +#define FSA4480_SLOW_GND 0x0c +#define FSA4480_DELAY_L_R 0x0d +#define FSA4480_DELAY_L_MIC 0x0e +#define FSA4480_DELAY_L_SENSE 0x0f +#define FSA4480_DELAY_L_AGND 0x10 +#define FSA4480_RESET 0x1e + +#define FSA4480_ENABLE_DEVICE BIT(7) +#define FSA4480_ENABLE_SBU GENMASK(6, 5) +#define FSA4480_ENABLE_USB GENMASK(4, 3) + +#define FSA4480_SEL_SBU_REVERSE GENMASK(6, 5) +#define FSA4480_SEL_USB GENMASK(4, 3) + +struct fsa4480 { + struct i2c_client *client; + + /* used to serialize concurrect change requests */ + struct mutex lock; + + struct typec_switch_dev *sw; + struct typec_mux_dev *mux; + + struct regmap *regmap; + + u8 cur_enable; + u8 cur_select; +}; + +static const struct regmap_config fsa4480_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .max_register =3D FSA4480_RESET, +}; + +static int fsa4480_switch_set(struct typec_switch_dev *sw, + enum typec_orientation orientation) +{ + struct fsa4480 *fsa =3D typec_switch_get_drvdata(sw); + u8 new_sel; + + mutex_lock(&fsa->lock); + new_sel =3D FSA4480_SEL_USB; + if (orientation =3D=3D TYPEC_ORIENTATION_REVERSE) + new_sel |=3D FSA4480_SEL_SBU_REVERSE; + + if (new_sel =3D=3D fsa->cur_select) + goto out_unlock; + + if (fsa->cur_enable & FSA4480_ENABLE_SBU) { + /* Disable SBU output while re-configuring the switch */ + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, + fsa->cur_enable & ~FSA4480_ENABLE_SBU); + + /* 35us to allow the SBU switch to turn off */ + usleep_range(35, 1000); + } + + regmap_write(fsa->regmap, FSA4480_SWITCH_SELECT, new_sel); + fsa->cur_select =3D new_sel; + + if (fsa->cur_enable & FSA4480_ENABLE_SBU) { + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, fsa->cur_enable); + + /* 15us to allow the SBU switch to turn on again */ + usleep_range(15, 1000); + } + +out_unlock: + mutex_unlock(&fsa->lock); + + return 0; +} + +static int fsa4480_mux_set(struct typec_mux_dev *mux, struct typec_mux_sta= te *state) +{ + struct fsa4480 *fsa =3D typec_mux_get_drvdata(mux); + u8 new_enable; + + mutex_lock(&fsa->lock); + + new_enable =3D FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB; + if (state->mode >=3D TYPEC_DP_STATE_A) + new_enable |=3D FSA4480_ENABLE_SBU; + + if (new_enable =3D=3D fsa->cur_enable) + goto out_unlock; + + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, new_enable); + fsa->cur_enable =3D new_enable; + + if (new_enable & FSA4480_ENABLE_SBU) { + /* 15us to allow the SBU switch to turn off */ + usleep_range(15, 1000); + } + +out_unlock: + mutex_unlock(&fsa->lock); + + return 0; +} + +static int fsa4480_probe(struct i2c_client *client) +{ + struct device *dev =3D &client->dev; + struct typec_switch_desc sw_desc =3D { }; + struct typec_mux_desc mux_desc =3D { }; + struct fsa4480 *fsa; + + fsa =3D devm_kzalloc(dev, sizeof(*fsa), GFP_KERNEL); + if (!fsa) + return -ENOMEM; + + fsa->client =3D client; + mutex_init(&fsa->lock); + + fsa->regmap =3D devm_regmap_init_i2c(client, &fsa4480_regmap_config); + if (IS_ERR(fsa->regmap)) { + dev_err(dev, "failed to initialize regmap\n"); + return PTR_ERR(fsa->regmap); + } + + fsa->cur_enable =3D FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB; + fsa->cur_select =3D FSA4480_SEL_USB; + + /* set default settings */ + regmap_write(fsa->regmap, FSA4480_SLOW_L, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_R, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_MIC, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_SENSE, 0x00); + regmap_write(fsa->regmap, FSA4480_SLOW_GND, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_R, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_MIC, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_SENSE, 0x00); + regmap_write(fsa->regmap, FSA4480_DELAY_L_AGND, 0x09); + regmap_write(fsa->regmap, FSA4480_SWITCH_SELECT, fsa->cur_select); + regmap_write(fsa->regmap, FSA4480_SWITCH_ENABLE, fsa->cur_enable); + + sw_desc.drvdata =3D fsa; + sw_desc.fwnode =3D dev->fwnode; + sw_desc.set =3D fsa4480_switch_set; + + fsa->sw =3D typec_switch_register(dev, &sw_desc); + if (IS_ERR(fsa->sw)) { + dev_err(dev, "failed to register typec switch: %ld\n", PTR_ERR(fsa->sw)); + return PTR_ERR(fsa->sw); + } + + mux_desc.drvdata =3D fsa; + mux_desc.fwnode =3D dev->fwnode; + mux_desc.set =3D fsa4480_mux_set; + + fsa->mux =3D typec_mux_register(dev, &mux_desc); + if (IS_ERR(fsa->mux)) { + typec_switch_unregister(fsa->sw); + dev_err(dev, "failed to register typec mux: %ld\n", PTR_ERR(fsa->mux)); + return PTR_ERR(fsa->mux); + } + + i2c_set_clientdata(client, fsa); + return 0; +} + +static int fsa4480_remove(struct i2c_client *client) +{ + struct fsa4480 *fsa =3D i2c_get_clientdata(client); + + typec_mux_unregister(fsa->mux); + typec_switch_unregister(fsa->sw); + + return 0; +} + +static const struct i2c_device_id fsa4480_table[] =3D { + { "fsa4480" }, + { } +}; +MODULE_DEVICE_TABLE(i2c, fsa4480_table); + +static const struct of_device_id fsa4480_of_table[] =3D { + { .compatible =3D "fcs,fsa4480" }, + { } +}; +MODULE_DEVICE_TABLE(of, fsa4480_of_table); + +static struct i2c_driver fsa4480_driver =3D { + .driver =3D { + .name =3D "fsa4480", + .of_match_table =3D fsa4480_of_table, + }, + .probe_new =3D fsa4480_probe, + .remove =3D fsa4480_remove, + .id_table =3D fsa4480_table, +}; + +module_i2c_driver(fsa4480_driver); + +MODULE_DESCRIPTION("ON Semiconductor FSA4480 driver"); +MODULE_LICENSE("GPL v2"); --=20 2.33.1