From nobody Thu Apr 2 22:28:52 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC7C5339861; Mon, 23 Feb 2026 18:27:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771871275; cv=none; b=FMUPveCDZk0MLxz7micp0nyE7eHny6O+8yhF+WEPourUqCJA222pFLRTFRIEcRrDIkfWR1oXyyJIamjHKZRiz+Wscdt3ReB6+6Q/Kvf461QhmWCjx0z87R0qwAUIG7hNT0CM+/aTCYQfyTNVfBw5GjDWc4JNb1w2Tf4OqJa1xfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771871275; c=relaxed/simple; bh=Wz4vdsfnheRUMn1NJPAKeUGfoRavSQrri5sfE8QYfdE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oTYfxMEegr2GgYoWhs8xpKjYzv1qISUfzX6eS658y1QIFwZqCY23MEbyuTHgjxBLl9TBMAzXD+terKHaG6uxZD+0OuVoRASzzPFWREGBxrGYOzwbk3e7D7bAFccba/0Ursck585Kv5wfcVMRZUgCKjt6884omMRm6VWHd2sMS4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=WyNIyzmZ; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="WyNIyzmZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1771871271; bh=Wz4vdsfnheRUMn1NJPAKeUGfoRavSQrri5sfE8QYfdE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WyNIyzmZ/X4XUurgK4i4TOkb78mh7o+nRhZhVJTCrU0W/hgDQ2ob9oqWFdAcK+CSf bGQjwrONU4x2uOvglGCny1BOdPpXUQCaUkc1dUjBmVx4CEx8YOuEf3DxdhEzwCwyTK sp3aZ2uBmmEsTUesk9+6TpS/HC85X7QGmqZw4BAcYn9SUTn1/oDo92KN6VWljdFwfD uo7jRWjdS4YfFwVYRQHpaL+ZKMckYHskW4Az8Ro3FbGH/UC4nWppiz2TeJJI5beFLy j4ZryKe3PMm+eE9nZN8Qr4Van6SyxCNm2XmB+AN+9c41daRXqNa184yxAIn/HYtQTd FRycn4FqQKSeA== Received: from jupiter.universe (dyndsl-091-248-208-033.ewe-ip-backbone.de [91.248.208.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3FE5417E05E8; Mon, 23 Feb 2026 19:27:51 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id E53A9480023; Mon, 23 Feb 2026 19:27:50 +0100 (CET) From: Sebastian Reichel Date: Mon, 23 Feb 2026 19:27:38 +0100 Subject: [PATCH v2 1/2] usb: typec: mux: avoid duplicated orientation switches Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260223-typec-mux-duplication-fix-v2-1-0402fefc222e@collabora.com> References: <20260223-typec-mux-duplication-fix-v2-0-0402fefc222e@collabora.com> In-Reply-To: <20260223-typec-mux-duplication-fix-v2-0-0402fefc222e@collabora.com> To: Heikki Krogerus , Greg Kroah-Hartman Cc: linux-rockchip@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Sebastian Reichel X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1831; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=Wz4vdsfnheRUMn1NJPAKeUGfoRavSQrri5sfE8QYfdE=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmcnCaBWimLuXHxcBpFaiErYcWKIDL4Eyma8 mRYvgjWbUp554kCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpnJwmAAoJENju1/PI O/qadVIQAJ6YZd4th8kIg1eQFpweAdS6jAwP02zIJ6IGRDN5P8UAxHgsq/xJGBoui58INu4/FHs OHJdZ5P2WSIEyvsLicoZsOZtRE2i94CkZPLlJB5fr1W3yc6fngrgyFyjLRiqImzo9KcDElCyny+ mHXCPafxdhlC3hOZ2DW2A5qekxt6LfRJNQXAg9zSI3GOEu6xNKbtf/D9rhehszQ7KZOTEmpHuZq wPtHnMWoi2YwuGgtpCH10ffwdtG8QLqgT6gZ6Mm4pCuKTJeHjnI5jtujRnfDlrVp1XDxgLfwJiJ GmMrVBf4JNdRIXvy5PmPkMBdy/9xNGL9QEaCMd4K0vHI4gAMH0tuCECxN0vN6szHLErQ3OcM4DC BwqMLY9p5/h3IJS+GB4xKJV39hVQ1tElkbGAOZ51XRwHKExf4hjJZWXG7x/1fjPEVnStf0zxFTD Cc2j5nZ+Bs6kp7J9TE0ZitkabrgBuQD+oomQH2QKGTbh4ICmXj57MIDVPTB3OJZMfTQCqgLpL/U OhAOwojkRrdF4ePrdtnlKD+VgazSnR0yseNBDnm8RtcnqbFyjDxi1G2DjD+jBHNfctuKJRHAFoM 1MmDOgHCD06AA8pIk6H0l/4oNE9pl7oJkjH/sm3DvJL44V/WyZsvTc4CKpzP49oXDWy3XFpX1JH 41Kr6wYQw/nUfla6noBYj4A== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A Some devices use combo PHYs (i.e. USB3 + DisplayPort), which also handle the orientation mux. These PHYs are referenced twice from the USB-C connector (USB super-speed lines and SBU/AUX lines) resulting in the switch being configured twice. Avoid this by dropping duplicates. Signed-off-by: Sebastian Reichel Reviewed-by: Heikki Krogerus --- drivers/usb/typec/mux.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index 58fb97ea6877..9b908c46bd7d 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -35,7 +35,9 @@ static int switch_fwnode_match(struct device *dev, const = void *fwnode) static void *typec_switch_match(const struct fwnode_handle *fwnode, const char *id, void *data) { + struct typec_switch_dev **sw_devs =3D data; struct device *dev; + int i; =20 /* * Device graph (OF graph) does not give any means to identify the @@ -56,6 +58,13 @@ static void *typec_switch_match(const struct fwnode_hand= le *fwnode, dev =3D class_find_device(&typec_mux_class, NULL, fwnode, switch_fwnode_match); =20 + /* Skip duplicates */ + for (i =3D 0; i < TYPEC_MUX_MAX_DEVS; i++) + if (to_typec_switch_dev(dev) =3D=3D sw_devs[i]) { + put_device(dev); + return NULL; + } + return dev ? to_typec_switch_dev(dev) : ERR_PTR(-EPROBE_DEFER); } =20 @@ -80,7 +89,8 @@ struct typec_switch *fwnode_typec_switch_get(struct fwnod= e_handle *fwnode) if (!sw) return ERR_PTR(-ENOMEM); =20 - count =3D fwnode_connection_find_matches(fwnode, "orientation-switch", NU= LL, + count =3D fwnode_connection_find_matches(fwnode, "orientation-switch", + (void **)sw_devs, typec_switch_match, (void **)sw_devs, ARRAY_SIZE(sw_devs)); --=20 2.51.0 From nobody Thu Apr 2 22:28:52 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC755339856; Mon, 23 Feb 2026 18:27:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771871274; cv=none; b=V8TzNvF/yPLSQnzCeXC34BDoY+Hd1zItANXsIvogLoGjYa6vaY2du+06qF9EKSmIQd7cRMkFOCAQnAVl8tH/7qfqtPe5/omj64OB0RtaIoPCoTBgTy1388LlYZqjxympik71dO+WSn5HmjWVaOkHg0zjLQQYDd6KWXyn5fEQrLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771871274; c=relaxed/simple; bh=ZKTKJXwc+kl7Ab9mU1SVJNsU6LthWfVAAfFAYE4wjoY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pqBYn33kR+F9RoymCDVxAWsK2bguNmxGjcmCubzSJawH+UcVgT4ktcQhwn3n29svtJ2Xcq+EVjETYLg6igu5/KIilDlB7Rm954dkPsZIObAszz0+zcLc4PKyTXGyTMU580zmlQ4FeyYIZO9y6UKuw9TOkcJls6ehk6JDnpLT/zM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Ld8V3TW3; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Ld8V3TW3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1771871271; bh=ZKTKJXwc+kl7Ab9mU1SVJNsU6LthWfVAAfFAYE4wjoY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ld8V3TW331cwhDSd3oWPpeMhcKEo5Z9XNOnTZeiUvBLsfFpUfvasDf+j/8ZtxWqpg AW3wnX8ibOTBTT/lJJnsf1mFW0xxotQ3aRwe7FD0uWfLRknWaBBI0yiumy26OUpZ56 gfkiN+ePRSidM4WBC15Ogp7V96wvboe9FOHwJoTJF/6aMnLr+cToYNuzFHHQ45J7Gm nUj+/43bUOY8bPrvKSBRUtBFtHvsI+qZd9rSx15foHmn//pvK+c5T5J63l/bCeD++s aXFofTy4yXp/Himeuu+Z56QDOvS2B8Z6zefHeSTPcY+Sgho3YrBCqzecNBUobibZ64 Dxs9tX64sf2ag== Received: from jupiter.universe (dyndsl-091-248-208-033.ewe-ip-backbone.de [91.248.208.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3E84517E05B5; Mon, 23 Feb 2026 19:27:51 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id E588A480026; Mon, 23 Feb 2026 19:27:50 +0100 (CET) From: Sebastian Reichel Date: Mon, 23 Feb 2026 19:27:39 +0100 Subject: [PATCH v2 2/2] usb: typec: mux: avoid duplicated mux switches Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260223-typec-mux-duplication-fix-v2-2-0402fefc222e@collabora.com> References: <20260223-typec-mux-duplication-fix-v2-0-0402fefc222e@collabora.com> In-Reply-To: <20260223-typec-mux-duplication-fix-v2-0-0402fefc222e@collabora.com> To: Heikki Krogerus , Greg Kroah-Hartman Cc: linux-rockchip@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Sebastian Reichel X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1774; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=ZKTKJXwc+kl7Ab9mU1SVJNsU6LthWfVAAfFAYE4wjoY=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmcnCaum/l9UPE3MDVcAZ5Xfc/Rjp4GpY5Qu 6fLesuQtgZ2sYkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpnJwmAAoJENju1/PI O/qaXksQAI4aqlfRVReFnKOboH85tS8yesiJbV4tGE9NS01dgNjjcjC20WgTYybPNc3cfgTbFw4 9dRYtq776Dd7yyAn/2P3EUuKLvESlc96OhSaIj5SZD1BoYixEaTsnGOcpNWZqJk9Tjl2phlzLui hXZYCFjKOaR+1en0zp/pY/G0oEOEocO47H0Pq8lvGdwmJt6GFsVGDbqyxRZ0Pwf7pyamFKWmQL6 u7MTL9y1HFzZSuMkIu+4quA40CQp7aUFQVZGBrvQhtRcFES8/09mNZeQXYQPCi3YwahSw48Qp8E 8MJwsiP81rtWOhcJMq6vM7E4r4gbcNIsoRtA7TLjaqoLLry4JE9X+8pdnhyCoPBAI+ROnE8bOJP BqoQbn5QLcKy9O0aMNze7gkwnWifZ0ihu5XvChLurkjM2I8spWgt3flff4ApezJEawsRVM6x0k4 ViS+VXmp+S23+bEXpP/wugX9mpV1BnN16LLo0B9snfWNe2fuHvH5ROVVKl8vi+skiQqTChvSciY H6SgPNcmBLi6heloSBZK5r48uBL8Im2QkX/olGT0LfJDu/QW9jfco1JH6Vj+jl5LGYRUPUgJoEQ K3n6Fm1EQdzPa09XifcEdyRfPNVoEPsdmLqPWAdkn3LG+DC6eKIIp8wwHRhUmDmujZeSysmXrRW uYC6phPR8m/YRCqxgTuUlmQ== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A Some devices use combo PHYs (i.e. USB3 + DisplayPort), which also handle the lane muxing. These PHYs are referenced twice from the USB-C connector (USB super-speed lines and SBU/AUX lines) resulting in the mux being configured twice. Avoid this by dropping duplicates. Signed-off-by: Sebastian Reichel Reviewed-by: Heikki Krogerus --- drivers/usb/typec/mux.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c index 9b908c46bd7d..db5e4a4c0a99 100644 --- a/drivers/usb/typec/mux.c +++ b/drivers/usb/typec/mux.c @@ -275,7 +275,9 @@ static int mux_fwnode_match(struct device *dev, const v= oid *fwnode) static void *typec_mux_match(const struct fwnode_handle *fwnode, const char *id, void *data) { + struct typec_mux_dev **mux_devs =3D data; struct device *dev; + int i; =20 /* * Device graph (OF graph) does not give any means to identify the @@ -291,6 +293,14 @@ static void *typec_mux_match(const struct fwnode_handl= e *fwnode, dev =3D class_find_device(&typec_mux_class, NULL, fwnode, mux_fwnode_match); =20 + /* Skip duplicates */ + for (i =3D 0; i < TYPEC_MUX_MAX_DEVS; i++) + if (to_typec_mux_dev(dev) =3D=3D mux_devs[i]) { + put_device(dev); + return NULL; + } + + return dev ? to_typec_mux_dev(dev) : ERR_PTR(-EPROBE_DEFER); } =20 @@ -316,7 +326,8 @@ struct typec_mux *fwnode_typec_mux_get(struct fwnode_ha= ndle *fwnode) return ERR_PTR(-ENOMEM); =20 count =3D fwnode_connection_find_matches(fwnode, "mode-switch", - NULL, typec_mux_match, + (void **)mux_devs, + typec_mux_match, (void **)mux_devs, ARRAY_SIZE(mux_devs)); if (count <=3D 0) { --=20 2.51.0