From nobody Sun Feb 8 18:24:38 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 3C15F1DE4CD for ; Tue, 3 Feb 2026 18:42:07 +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=1770144129; cv=none; b=QpXIw4cbXDwI/YzIRzqjDpLFBY1yZcGvwD5ErWqy8sHF1U3luKA5IkvWIiBGGEMNYplzlPF6bfZitMqmipyNm0CDAQMbN1XaeInpnxphhuL32OVO+SFqTIINneTYUIgQolhtuFe9J7LSfNpnKExvuY3alQbtRQqbL7OxhdQqWUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144129; c=relaxed/simple; bh=oMsJDM1MmVk2bHHw13eaAXk939zCI0dmHOrouppRrk8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nyf++O5YxwJhWkfi6ln3kA9jESOS58uvTw15B6Jmkzx3nQ7rlZzKKgOF7qr/tnlr8dKuzQ98piH8DgMWX/y7y3i4ozRJ1vB8+1DjLmIo7fStfN0EqJyu/fmgSFFnm8noNotyjRTKR0xVyxWLgrbEtZolM42xy02gY96kuCWtCCU= 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=JSUgRBId; 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="JSUgRBId" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144125; bh=oMsJDM1MmVk2bHHw13eaAXk939zCI0dmHOrouppRrk8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JSUgRBIdEzrgEdzouOrzrrHeKi4m6Wx4oLvmlmtLudmJOczFHXDJZhd7VbmUfg6XW l98rDcJKKT4CIcxbjDKiD//DZzlWN1ryMkR7JmCP0n7P3saMjvWSCvfkU/WG/oPiAG 7gM4xzzJ7vXMUiI4ZSqRDTa+tw/t0AVQRtgNdKq9zjpWisEGL0TFg6zWcU8FH9yI36 cimp0uWZGp7AcEt3epL4S6VmQzA3IJNFsSwpB7RQCHOE39hhkpVVaWq/HarQGqbjni I7hUMAMgcUm83nkYyod4ouPsVGC0zdgYpJBN6JEN0Sg7Z/bIa38YsoibmzKf52pl61 itt6U/SW+jIuw== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (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 86C4A17E140C; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 4A826480023; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:27 +0100 Subject: [PATCH 1/7] phy: rockchip: usbdp: Amend SSC modulation deviation 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: <20260203-rockchip-usbdp-cleanup-v1-1-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Sebastian Reichel , Frank Wang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1708; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=zxFHGi7c7hyE1yQCyWeBG1H5qOuim8JFl3knpk3L5BY=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX2HK34vgfc7ifeBwoRb19y3FVD04V4HY XOUY0Dnc34txYkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qaOnwP/Rzkxen/YlLoXL7Rj/zlG0SXOsUiOr9CE8CsAgHeFw6VN5rjRhoeaJzX7OcT1pfsg2R aUkQXMo/T+1NCnZn6pGDdQJ5q8qm2l/LuFAJhanBg/fDFt9hGE4EX9gL2axjUG4VH86YZr4axsY RGmMI53A5NUrTdcRNQFSgRR/XNJsV8pzdkTdh/CyL6aHpIG2oGGO2PwkIp8/qeiOyINMT+UcBds LopQko0tlZrp2lwi98H2iObwtrqnSypmrWmwgWTbybAK8fzrs65j5TGhVkT173lx3+UDjUp9a95 eKA6uOD5P/Yl9E3h9gNX/ZP20GHWTSP2IqehHIRi0mr2thYsazguHxFL9YwcGerTL/OELxHdX0o O66Amm+5pyT5/18Pcd1UjKQVzaCwziK/zl0nbtEkYwkdzSfSTN8ys0o7JvFzmWqUwfWfJnzI9Da dlBof9kOODfIA9Bi1cy+RKGYpLJhIPwRzSv72Ib4maWHnSBkSRjt4dE3cLFNYdY0t04oBQMcXLZ rR3h9+mtuXlH8jQWP8c9oLFmgXLgjInUsEN43wRaJUWqZW/CA1eAF0rzxadicRe9EuEPedT2gYH DF3+AeWwQU7IHrXjGO8cBTsrdFLU7QVVe5XlFttTbfd7r0XqZUMVctBE9otL8x0+f741mDUHFCs CnhGIQN/HtPCu9ND1IpcucQ== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A From: Frank Wang Move SSC modulation deviation into private config of clock - 24M: 0x00d4[5:0] =3D 0x30 - 26M: 0x00d4[5:0] =3D 0x33 Signed-off-by: Frank Wang [Taken over from rockchip's kernel tree; register 0x00d4 is not described in the TRM] Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index fba35510d88c..b494819be284 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -350,7 +350,8 @@ static const struct reg_sequence rk_udphy_24m_refclk_cf= g[] =3D { {0x0a64, 0xa8}, {0x1a3c, 0xd0}, {0x1a44, 0xd0}, {0x1a48, 0x01}, {0x1a4c, 0x0d}, {0x1a54, 0xe0}, - {0x1a5c, 0xe0}, {0x1a64, 0xa8} + {0x1a5c, 0xe0}, {0x1a64, 0xa8}, + {0x00d4, 0x30} }; =20 static const struct reg_sequence rk_udphy_26m_refclk_cfg[] =3D { @@ -377,7 +378,7 @@ static const struct reg_sequence rk_udphy_26m_refclk_cf= g[] =3D { {0x0c30, 0x0e}, {0x0c48, 0x06}, {0x1c30, 0x0e}, {0x1c48, 0x06}, {0x028c, 0x18}, {0x0af0, 0x00}, - {0x1af0, 0x00} + {0x1af0, 0x00}, {0x00d4, 0x33} }; =20 static const struct reg_sequence rk_udphy_init_sequence[] =3D { @@ -412,8 +413,7 @@ static const struct reg_sequence rk_udphy_init_sequence= [] =3D { {0x0070, 0x7d}, {0x0074, 0x68}, {0x0af4, 0x1a}, {0x1af4, 0x1a}, {0x0440, 0x3f}, {0x10d4, 0x08}, - {0x20d4, 0x08}, {0x00d4, 0x30}, - {0x0024, 0x6e}, + {0x20d4, 0x08}, {0x0024, 0x6e} }; =20 static inline int rk_udphy_grfreg_write(struct regmap *base, --=20 2.51.0 From nobody Sun Feb 8 18:24:38 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 3C2922773D3 for ; Tue, 3 Feb 2026 18:42:07 +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=1770144129; cv=none; b=GImkSrk1SOZWpBY/9/iOTW3LiG+iyGMNmCAKSUiCYnNVWau3kqEbrxU8Z9ukIL15k3n0/X+7un7TeB+iar1Cym8q8QF/9egAS66ZbVWoQWissAWSkTIMrzB/SctVbZFW4+l56axjpqr5uqWdHwEaBcEgnZvP1Ta6SfZnT7knMt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144129; c=relaxed/simple; bh=fiS+Dsf7kejX8rScYfkmaaLrPJb2gNjvgY69POQjL74=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AFI2gQPBPosKA/E9bClOu+htuRiXnWaCHz5Wpw5NEZ5PvcxCfj5sXpXif+8hIj+l81xulapwjfHEPN8e1ejPaktJ2fSYzp8uxxUXGoqguZPsnV0ZCw4S/0deWe+R0gV1oW8A+bVzrVduHvYVcNO0DZiw+fyYPWYr/uefuIs+AlM= 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=qJCm4Vpz; 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="qJCm4Vpz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144125; bh=fiS+Dsf7kejX8rScYfkmaaLrPJb2gNjvgY69POQjL74=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qJCm4VpzioKSrLqOhsnrXy+XjjfgZLRcdFMPKUg57jnrcJZTQuNF/Un0LmagglpFx bbaqqJUbgEHRfdFZ5FC+pC9E/QjSbqhjSDTaLwVuXz/gBdbyaBae5MUZ+hpRNspIKT J9PbAtfD8hlfrwEvJLlfAjTJehKIPMZYCvAEj6jQPB1sGVmJTRSxv3G7d0oR0RGbc9 kiLAi8FML7lfbGUMLfgBPh9OlOcNajNQIaoAMFDWOuOZ6NpcsexTqEH1c+P8ug3Xto DR/E7R1XDmc75g4xlGVVDmeM1Jo1TgiYVboYQ6WyhPPFKKCsmEgKAy/pi5kLtB5JEs VTkFdXbeL7xGg== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (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 81F6B17E0927; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 4B637480027; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:28 +0100 Subject: [PATCH 2/7] phy: rockchip: usbdp: Fix LFPS detect threshold control 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: <20260203-rockchip-usbdp-cleanup-v1-2-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Sebastian Reichel , William Wu X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1464; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=6KTsI7g25/YTK5NqGxPQGl5yWawgw8+Ad7FeccmRckk=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX0N/sukoZNN81S2a1Xt9AvKmgNodU1mh f4X/sB6QfKB+IkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qaN2sP/jUtS/35QjGdbSsXIl9TsKYB2ct9jnfFprR4enUwqpT5vMrJZ1ygscdBtqbflVn41q9 WkUQ6VArXS2Tep1zAlaC03XvUcKt93Yk5zehyjQrlmO8x+ssXzNmTC/Y1CNrD5FuVr2GEMGyEK4 pg78ZH9orwsCq0Umw1jQZlOH0UEH9NceerQ8s00Ek6rsDm6FMJoe8/bKBnFb6CeodPxh4/d3Ao7 anpUGarJxBSle1whl4n6th9fxpgQZ32Zycn386lXg0HuvfQoYQLZ91ujCNWY7jT94ZEpiAxytPR cGTyzY5OipVxrYOhPz/vN0Oh2uk73zDom3fmh6w2rR0NkYA0TBXgjnXdmWNwB9YXey2ZTtKI+b9 1xsqVoJtbqDaRPGWuDLrnpUtg8hJLWaKF6Bb/ge34+g20RBiecF3NzXWsR+gw/B+7PoqqZj56do /Qlc0Js8Lsm5yrnbLqJfCHd0UBhVEJJzCrj+hp11k7U1Yqufi2bvKLiszpKYsIdkEIM7KlMOppx CWoCOFYBKpeK4IOK5jc7oKmV9SjFjTnid6K5olMKRKhRUqIrOpMEz4NXivHohnhJ5e1kBJU1djZ nha4I4WfabKI+cvL7F2F7khBrVzXQVgeu+j0ca8kKtiyaP9hyMt2tjhtU4F8VnnQaS6ugpHwzVK 1HRqu9O2iEmjBu/a8Fuo7AA== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A From: William Wu According to the LFPS Tx Low Power/LFPS Rx Detect Threshold [1], the device under test(DUT) must not respond if LFPS below the minimum LFPS Rx Detect Threshold 100mV. Test fail on Rockchip platforms, because the default LFPS detect threshold is set to 65mV. The USBDP PHY LFPS detect threshold voltage could be set to 30mV ~ 140mV, and since there could be 10-20% PVT variation, we set LFPS detect threshold voltage to 110mV. [1] https://compliance.usb.org/resources/LFPS_Rx_Tx_Low_Power_Compliance_Up= date_Rev5.pdf Signed-off-by: William Wu [Taken over from rockchip's kernel tree; the registers are not described in the TRM] Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index b494819be284..7e4142aef192 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -413,7 +413,8 @@ static const struct reg_sequence rk_udphy_init_sequence= [] =3D { {0x0070, 0x7d}, {0x0074, 0x68}, {0x0af4, 0x1a}, {0x1af4, 0x1a}, {0x0440, 0x3f}, {0x10d4, 0x08}, - {0x20d4, 0x08}, {0x0024, 0x6e} + {0x20d4, 0x08}, {0x0024, 0x6e}, + {0x09c0, 0x0a}, {0x19c0, 0x0a} }; =20 static inline int rk_udphy_grfreg_write(struct regmap *base, --=20 2.51.0 From nobody Sun Feb 8 18:24:38 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 3C2FE277CB8 for ; Tue, 3 Feb 2026 18:42:07 +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=1770144129; cv=none; b=eesDDgNheCgQjWlmsZocFDsGmpz9jupCi6pheHZt+b1gnxlT7Kp7m426w/PkzTgWO354+RuHLL+F8wxIuv5Hf6GanJpPm+unxO5S5PYtbtM8DVeccuhiQFj09hEnPHhlHhPnJqcgPvhx3+9kqYJqnbxdK6fCioU8j4aWsAGEAII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144129; c=relaxed/simple; bh=aNPpmtizUfjCpacYUbzlKBxSJjjfFCObnLLiTwZTN6g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j3vt5VeVgjqXNIlgdk6S/dBz+Lub5nPD9e+g7hZDP56QgHgd2ErXjPUvuL8Ca2n8vU5+CwSZnNAZbjukGousmPQlL/hBEsfxKgWAKnAlIzBgh4ogB1gbiELhxaMYMUHeFyePTw2p5EIUVAiRyo4rTFBfJ6h6A/ameRVewRswUQ8= 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=NwvtWA2L; 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="NwvtWA2L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144125; bh=aNPpmtizUfjCpacYUbzlKBxSJjjfFCObnLLiTwZTN6g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NwvtWA2LCqosWqCml+DCgm/ReMmenrZDKuDuxmACzfGBi9e77qnvl3O1KfV21NbWF q1EJYLC4S/wo2jraiktT42lsrSjMRFlC9N2nAQG2n5h9KtMwW1ZMgQ07DajVsD3VBR te0wr42WmF65waN4tXa2JZwYvwyakZz+Cqo79EJ2YxBHJCMK1DQAbYich/GV4D7zIK n25L7g5Wnl92HQlfb6TA3fHlGB9Vfelr723uyGY7HWfJ+KVGga/32Slb3amB7KcBlO aXUeDCknD6jPQRl3Fc3tdXrHcwh4AY4BkAGWbCfm46Tmc1225hJbG1mkmpisNb4vgZ KQB1FlcPsbALA== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (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 8354017E1276; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 4CC3B480028; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:29 +0100 Subject: [PATCH 3/7] phy: rockchip: usbdp: Add missing mode_change update 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: <20260203-rockchip-usbdp-cleanup-v1-3-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.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=1949; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=aNPpmtizUfjCpacYUbzlKBxSJjjfFCObnLLiTwZTN6g=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX0AAJVtr1ntwPQSj4vwqW8lHUnFIL9jt R+Tyb5HmUFVGokCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qafBoP/0QWxxxWbY8PGSBabiYxPlGQNLQzvQYqWBZnnOMMDqliYOfYS+rSJKrVceLfpsR7mgI RdF0hSxuNuYV9ynyBE0aIavsxHSBnMhgoeMHPEL0sVt+T1qXRmNhQrU2/AWd327tZDACurRwxjV QVOk3iVP00V1c1ovfvKq7MCaaxRueyi4lEwWgEYblCY9YWwyiR5UJJqjQ0RD3RxaOAXYu7SOLlc FyqWzlnT8SwBewIpIb9AqFSxU7ifNeOfKzJ8NOhmuIL+GdB4yWvxDx3J4k2e2oiSpqENH0dRs7Y tyMRpM90PyBnyT2RnminUVRbUZOG9CIvMOcFw6rAG/CS2EYYHsvrf7UkfoDfPW6yr9hisrb1a5l psL4O6WR50+PeQYFjy/PigGNQi4nCnLKo6OecMZ05WmQDAq1FnPIAAOtHA8t3R4vEKwJ39MxmTk RsQxNh7b0vEmVYl11m7YnuliyXSOlVCS1OOeb2HdWP/VmgL+5RHLh93FYCWCh58U9Tx+CLYO70U uQfNrfr0Lu3RrJOUxPWLw+td2g5CVLbvDUPAQ6VwrcwHhjwhGtGj9hsbUm0Uf5HNvRmoaPwnyU8 /JBVMRkyqNJOAyMNDI7/rPqCE7xCMuTtfUUu10S0USrUbLNLo08SVygMcKNcJ35XFr1giC7Z/wi 70Ega1KRNvEDNDFHyn98itg== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A rk_udphy_set_typec_default_mapping() updates the available modes, but does not set the mode_change as required. This results in missing re-initialization and thus non-working DisplayPort. Fix this issue by introducing a new helper to update the available modes. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index 7e4142aef192..5304e2d86d11 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -619,6 +619,15 @@ static void rk_udphy_dp_hpd_event_trigger(struct rk_ud= phy *udphy, bool hpd) rk_udphy_grfreg_write(udphy->vogrf, &cfg->vogrfcfg[udphy->id].hpd_trigger= , hpd); } =20 +static void rk_udphy_mode_set(struct rk_udphy *udphy, u8 mode) +{ + if (udphy->mode =3D=3D mode) + return; + + udphy->mode_change =3D true; + udphy->mode =3D mode; +} + static void rk_udphy_set_typec_default_mapping(struct rk_udphy *udphy) { if (udphy->flip) { @@ -649,7 +658,7 @@ static void rk_udphy_set_typec_default_mapping(struct r= k_udphy *udphy) gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 1); } =20 - udphy->mode =3D UDPHY_MODE_DP_USB; + rk_udphy_mode_set(udphy, UDPHY_MODE_DP_USB); } =20 static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, @@ -1387,10 +1396,7 @@ static int rk_udphy_typec_mux_set(struct typec_mux_d= ev *mux, usleep_range(750, 800); rk_udphy_dp_hpd_event_trigger(udphy, true); } else if (data->status & DP_STATUS_HPD_STATE) { - if (udphy->mode !=3D mode) { - udphy->mode =3D mode; - udphy->mode_change =3D true; - } + rk_udphy_mode_set(udphy, mode); rk_udphy_dp_hpd_event_trigger(udphy, true); } else { rk_udphy_dp_hpd_event_trigger(udphy, false); --=20 2.51.0 From nobody Sun Feb 8 18:24:38 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 4EE5C291C07 for ; Tue, 3 Feb 2026 18:42:07 +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=1770144129; cv=none; b=ha8xGnN0mhQgyieBbaUxW1q1n4v4QsIMOzIvFUtDpIg2yVYDuy54Sxbg8fLvyljOLdnRaK4HScui5ay5KPWVmJ1IOHuoKDmPkLeiOe9RCvTwTY96fhJ2pUE0zBWIqS8HslSqXhycQGDoqhCQuf6ueQ0xtvM/sJIlId+6Un4Qvgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144129; c=relaxed/simple; bh=SvtKIo2y+sKOp+YtC+da7+YPXlC5HgI2IYRFSePlh/I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rzIi4G5pPytrlKw/DdPRl5yDgjHJb01jOLNSbK/smbbcbquYcHkL/TQxqnUVVcFhBI+31wKN6LfgrUn4i+JoCrew2EbsbBWajlUSDcPPkmwnUUORU9ZzK6933ZkSrotCek4HFiTLCJg163TL0zN2JsuqI2GS1VMdBoWxFKmfq9M= 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=lQtVRfqT; 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="lQtVRfqT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144125; bh=SvtKIo2y+sKOp+YtC+da7+YPXlC5HgI2IYRFSePlh/I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lQtVRfqTSj3NR+5/997m2rrQx1mAtIcsIapWSeFfxIZgO/6DYPk2d3IxaNqC7LmrQ JkCW2r7XaRfRCVYPHiH1mnh0pOubaVsK7elLiwS1XxstVGLImcHtqR0FmdLRqavU+n HWmRacfoaPTjdy0IMKn46k+IShKLhRfjz0qAmhHzUKxkHc/CHuTflUbfzJFjiWOtgd VTV1cSIaOxkRPw2LIhsv5lo1L3iX+9qmobixEouGW4FRdFt1ZTCvPnCZhErETyJlIh c49pm7FnMs6LZfU8AahlKtSPeDhObFJRiZM1nW5ii8hVPNpo5bQFaaG3obLP+jV0Ql IDuyyUdoBy3cQ== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (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 8841E17E14D8; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 4E17C480029; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:30 +0100 Subject: [PATCH 4/7] phy: rockchip: usbdp: Support single-lane DP 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: <20260203-rockchip-usbdp-cleanup-v1-4-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.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=5209; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=H3Fz2DEtOEQhk9K2oOowHJYENYfYQBLq7M6ENd/11/I=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX0d7sAhQ7/ntTw8u0Ks3J/nCDsx3Ro+x kr0UweGRwFUjYkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qaNe4P/1BiyrpHjbCQn4EJ8POqANqkRWZ5Q0oyUiuwsZ20Z/4RaW5fY8nIQNgKal/3nwd0RZ9 juJkZj39g5JmWHI8v0U5LHZTCYqL4yBMYomnWrgynfYLsOER4g1g1Y+WzccJGEbl4Uy6LjmaZH0 jKsox9VzGnBk3m3Am+1NfrKfyM1/LrNR4v+zZi/aNGHsaLK3P/8477BByXRzRn2Dt6yF7CH2pE7 8jX6BUdeHNu+LrN0+Nr8lhsp3OJFBhHxyaQgh/uw5ywXNd0QWLikbj5DWMUaKOokcvYd6RJgr5q uQjCRharMVpmMubTQC2foXczHyxE//VZVA6RPXLMFF5bUDRw0eULNeQsR9zHdr+KXXP7UOwx+Db LEOizjKb0rbOBTf9/UWszUKpoEICXa+yxJ51dzeTzA610MdF4xzCv2x0nLgxiAe+StPGB3imxvJ XXsVGVBnKd5R++0Gt7JfjgjRX3Ymg1m9MSthF/NFjkwozVXhy7e8yf7VASu1/Lm+0H6MqFYnn65 S3saqzdpV3nQhKzw7e8D5uT4trj387RCAOoNKB14ENiNvrf3y0KVMl//7UP1n6tJVnbmbuW6lzW jWVNygcb2WE0Ku4DAESb/5nVKXHPP+ilRcWl3qG5TiD9UgQQKfLY1bZamsA9SqEO+xoSWqFEkQk rYpTuW5gmFIL5GEn5Lko0ug== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A From: Zhang Yubing Implement support for using just a single DisplayPort line. Signed-off-by: Zhang Yubing Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 61 +++++++++++++--------------= ---- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index 5304e2d86d11..29cf3f3bcec4 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -193,6 +193,7 @@ struct rk_udphy { int id; =20 bool dp_in_use; + int dp_lanes; =20 /* PHY const config */ const struct rk_udphy_cfg *cfgs; @@ -537,6 +538,13 @@ static void rk_udphy_usb_bvalid_enable(struct rk_udphy= *udphy, u8 enable) * <0 1> dpln0 dpln1 usbrx usbtx * <2 3> usbrx usbtx dpln0 dpln1 * -----------------------------------------------------------------------= ---- + * if 1 lane for dp function, 2 lane for usb function, define rockchip,dp-= lane-mux =3D ; + * sample as follow: + * -----------------------------------------------------------------------= ---- + * B11-B10 A2-A3 A11-A10 B2-B3 + * rockchip,dp-lane-mux ln0(tx/rx) ln1(tx) ln2(tx/rx) ln3(tx) + * <0> dpln0 \ usbrx usbtx + * -----------------------------------------------------------------------= ---- */ =20 static void rk_udphy_dplane_select(struct rk_udphy *udphy) @@ -544,18 +552,18 @@ static void rk_udphy_dplane_select(struct rk_udphy *u= dphy) const struct rk_udphy_cfg *cfg =3D udphy->cfgs; u32 value =3D 0; =20 - switch (udphy->mode) { - case UDPHY_MODE_DP: - value |=3D 2 << udphy->dp_lane_sel[2] * 2; + switch (udphy->dp_lanes) { + case 4: value |=3D 3 << udphy->dp_lane_sel[3] * 2; + value |=3D 2 << udphy->dp_lane_sel[2] * 2; fallthrough; =20 - case UDPHY_MODE_DP_USB: - value |=3D 0 << udphy->dp_lane_sel[0] * 2; + case 2: value |=3D 1 << udphy->dp_lane_sel[1] * 2; - break; + fallthrough; =20 - case UDPHY_MODE_USB: + case 1: + value |=3D 0 << udphy->dp_lane_sel[0] * 2; break; =20 default: @@ -568,28 +576,6 @@ static void rk_udphy_dplane_select(struct rk_udphy *ud= phy) FIELD_PREP(DP_AUX_DOUT_SEL, udphy->dp_aux_dout_sel) | value); } =20 -static int rk_udphy_dplane_get(struct rk_udphy *udphy) -{ - int dp_lanes; - - switch (udphy->mode) { - case UDPHY_MODE_DP: - dp_lanes =3D 4; - break; - - case UDPHY_MODE_DP_USB: - dp_lanes =3D 2; - break; - - case UDPHY_MODE_USB: - default: - dp_lanes =3D 0; - break; - } - - return dp_lanes; -} - static void rk_udphy_dplane_enable(struct rk_udphy *udphy, int dp_lanes) { u32 val =3D 0; @@ -659,6 +645,7 @@ static void rk_udphy_set_typec_default_mapping(struct r= k_udphy *udphy) } =20 rk_udphy_mode_set(udphy, UDPHY_MODE_DP_USB); + udphy->dp_lanes =3D 2; } =20 static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, @@ -897,7 +884,7 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy= *udphy) return 0; } =20 - if (num_lanes !=3D 2 && num_lanes !=3D 4) + if (num_lanes !=3D 1 && num_lanes !=3D 2 && num_lanes !=3D 4) return dev_err_probe(udphy->dev, -EINVAL, "invalid number of lane mux\n"); =20 @@ -923,7 +910,8 @@ static int rk_udphy_parse_lane_mux_data(struct rk_udphy= *udphy) } =20 udphy->mode =3D UDPHY_MODE_DP; - if (num_lanes =3D=3D 2) { + udphy->dp_lanes =3D num_lanes; + if (num_lanes =3D=3D 1 || num_lanes =3D=3D 2) { udphy->mode |=3D UDPHY_MODE_USB; udphy->flip =3D (udphy->lane_mux_sel[0] =3D=3D PHY_LANE_MUX_DP); } @@ -1076,18 +1064,17 @@ static int rk_udphy_dp_phy_exit(struct phy *phy) static int rk_udphy_dp_phy_power_on(struct phy *phy) { struct rk_udphy *udphy =3D phy_get_drvdata(phy); - int ret, dp_lanes; + int ret; =20 mutex_lock(&udphy->mutex); =20 - dp_lanes =3D rk_udphy_dplane_get(udphy); - phy_set_bus_width(phy, dp_lanes); + phy_set_bus_width(phy, udphy->dp_lanes); =20 ret =3D rk_udphy_power_on(udphy, UDPHY_MODE_DP); if (ret) goto unlock; =20 - rk_udphy_dplane_enable(udphy, dp_lanes); + rk_udphy_dplane_enable(udphy, udphy->dp_lanes); =20 rk_udphy_dplane_select(udphy); =20 @@ -1367,6 +1354,7 @@ static int rk_udphy_typec_mux_set(struct typec_mux_de= v *mux, udphy->lane_mux_sel[2] =3D PHY_LANE_MUX_DP; udphy->lane_mux_sel[3] =3D PHY_LANE_MUX_DP; mode =3D UDPHY_MODE_DP; + udphy->dp_lanes =3D 4; break; =20 case TYPEC_DP_STATE_D: @@ -1383,6 +1371,7 @@ static int rk_udphy_typec_mux_set(struct typec_mux_de= v *mux, udphy->lane_mux_sel[3] =3D PHY_LANE_MUX_DP; } mode =3D UDPHY_MODE_DP_USB; + udphy->dp_lanes =3D 2; break; } =20 @@ -1531,7 +1520,7 @@ static int rk_udphy_probe(struct platform_device *pde= v) ret =3D PTR_ERR(udphy->phy_dp); return dev_err_probe(dev, ret, "failed to create DP phy\n"); } - phy_set_bus_width(udphy->phy_dp, rk_udphy_dplane_get(udphy)); + phy_set_bus_width(udphy->phy_dp, udphy->dp_lanes); udphy->phy_dp->attrs.max_link_rate =3D 8100; phy_set_drvdata(udphy->phy_dp, udphy); =20 --=20 2.51.0 From nobody Sun Feb 8 18:24:38 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 7AB473161A6 for ; Tue, 3 Feb 2026 18:42:10 +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=1770144134; cv=none; b=abVLjl33feC36yYpfmZWOtnoteJm/NA2mP8qDOuY2XwMyslujY7FweBLiQKVAUaAl3P85qnK1QZ8QjczD0FHNPUvtOo8RTCauOqQbq0aVpEL7o0ViuEwvAjRRTpb8d8UmzV8SJsqYPlcGjRSx8ompMdZsa6iXQB4owphZWnrMzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144134; c=relaxed/simple; bh=b711gc4PFK5EzBAqbufG8O3Glxj/rw5vhAJhbZn59Jg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UzvxZA+tkD5gKrRtxBaGf2nCg8t3yjH7dwx9fETLggu91CrKWure8p6v4c5kUaBv56zbIGbvbo8c1n+JpELGg6LRxG9Wf0N5QXQqvllqUV/rE+zwTMLd2/mOB/NhhwxWX6Q8BtPnhlcrBjFQer9FNykM3vcj79DQ9wXLztO++Dg= 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=HySFaQGk; 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="HySFaQGk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144125; bh=b711gc4PFK5EzBAqbufG8O3Glxj/rw5vhAJhbZn59Jg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HySFaQGkzh6MS/GFfqOo7Pf9B8Q60D+QyTuK5Aq25iBiVGIZZlZYeAX2rU1lRqAAJ C++jBJL9AuWVNNypXc8oOoW7k94fVhCMAgKkg0VGRYIFvWW24tgLeXUEAH+2GLhH2G SjBVxJfaL/vyteM9/1JnveaI/f/ziU3s7ttLTXE0EEwAECRb39cX3zbbRWpGqpw7pR 4TSQs1tg3Lchkcd5DwHc5uQmnhqpeTqRJoehSEAju9fTK6PmrKjlCxsTyBnSCiDkCX at25/0h+rXa34DIs6Dk5evBYui6AOboeWVf3XUo0f+zwtgUaitCsZqxqi4dfseCotl VfPtNVpE9y4ow== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id D414C17E14F1; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 4F62C48002A; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:31 +0100 Subject: [PATCH 5/7] phy: rockchip: usbdp: Rename DP lane functions 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: <20260203-rockchip-usbdp-cleanup-v1-5-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.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=1950; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=b711gc4PFK5EzBAqbufG8O3Glxj/rw5vhAJhbZn59Jg=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX2ozhMASnQ2pYoJAZy+lKBqnYNKWp38m kxR7fXndYd5jIkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qaeN8P/ictD1F9ixC+DKx3PW89zPjOjISBEbkQ2OurKReKo63MMcITfHxW/C7gCLzJuPwrK92 51DiCIKimvID9KkEr+f9PyC5JToLDJ2ge/XP1EMmMlSRvDvgPk6d9JjDUa9Np25Zko60iauGMV1 DJ8w4vunULfrd0NF1ZhmKZlNsYKn4yemkDX3SC/DD74hx/iTXZfSpd0PqdNBuD6eerFnSuqkaAm +6pEHfpVPioEpQADDXfEYAeQLv/dE/3ToAyn4FQmo8ak7nQVMB+Ze1YdyF8fB6n89mxVDEhx2mv 7+jHl5ybLcSgfqAZBhUo/hxMT5qgGMqwqHzGXVYYkDRdEvX0FxeLpAGF/vX+WCjqw8AKr4y4vFG 1vinBwQzJn/mT94vYFmHZLjm9prxk8exEFIqBgczpov4dgjruvBsQa81PbvMCgtEJ2zPueXNl1s ApRuwlhomb2iMpySrqOzOai3xTzcUKtqs0oq2YxnicYeNzM+tAspcOXrvTyLW3ssPgcAMDnnd8W 0DQF+mjoxSVqnTdmbYp32whBO2vlfZA1NlAOwOcnpXM08/6s3QBbBmI+StbPXlrXGiVLAYjnYJn jhKxX45AEwKvk2GmrHt7rGcGo+5pYKyLJCRXLb0IGI7qqJXWiT1mv2HHHtjidxUzUFMhqN86D9I GSKu4CK9fTuk4Oc4vsAkuTw== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A The common prefix for DisplayPort related functions is rk_udphy_dp_ (with a final _), so update the two DP lane functions to follow that scheme. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index 29cf3f3bcec4..4388105dd8ce 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -547,7 +547,7 @@ static void rk_udphy_usb_bvalid_enable(struct rk_udphy = *udphy, u8 enable) * -----------------------------------------------------------------------= ---- */ =20 -static void rk_udphy_dplane_select(struct rk_udphy *udphy) +static void rk_udphy_dp_lane_select(struct rk_udphy *udphy) { const struct rk_udphy_cfg *cfg =3D udphy->cfgs; u32 value =3D 0; @@ -576,7 +576,7 @@ static void rk_udphy_dplane_select(struct rk_udphy *udp= hy) FIELD_PREP(DP_AUX_DOUT_SEL, udphy->dp_aux_dout_sel) | value); } =20 -static void rk_udphy_dplane_enable(struct rk_udphy *udphy, int dp_lanes) +static void rk_udphy_dp_lane_enable(struct rk_udphy *udphy, int dp_lanes) { u32 val =3D 0; int i; @@ -1074,9 +1074,9 @@ static int rk_udphy_dp_phy_power_on(struct phy *phy) if (ret) goto unlock; =20 - rk_udphy_dplane_enable(udphy, udphy->dp_lanes); + rk_udphy_dp_lane_enable(udphy, udphy->dp_lanes); =20 - rk_udphy_dplane_select(udphy); + rk_udphy_dp_lane_select(udphy); =20 unlock: mutex_unlock(&udphy->mutex); @@ -1094,7 +1094,7 @@ static int rk_udphy_dp_phy_power_off(struct phy *phy) struct rk_udphy *udphy =3D phy_get_drvdata(phy); =20 mutex_lock(&udphy->mutex); - rk_udphy_dplane_enable(udphy, 0); + rk_udphy_dp_lane_enable(udphy, 0); rk_udphy_power_off(udphy, UDPHY_MODE_DP); mutex_unlock(&udphy->mutex); =20 --=20 2.51.0 From nobody Sun Feb 8 18:24:38 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 7ABCF366803 for ; Tue, 3 Feb 2026 18:42:10 +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=1770144132; cv=none; b=H692LwOD69fpgKa7q/N9xxCE4va4zCPD5CABQLGs2ywrn50zWFWIZKyKmTgzsB5WCljXP1Jnfb0TgyMT/wsca1irnyUFOF/zhQzkr/lh903XtIdHJctz0Sw+Z4wx779PZPsHTzwZsFWarvcsrkW9+0YpnjqkW1qziI6xD8lMaP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144132; c=relaxed/simple; bh=BLWs61GCfo1s83BYplKIk5R6XzcPP/MZOpccHPKGpKE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=drJhZSfy7q2wYc9lfENyzXrx2BoYPw0z5szq9MuGr22KUC+Ll0mwPi4z2plmAGs0hH+tQDkx5uaWBPbSgjyR8C33Yp0/S8p21YnjjeJ8026/uctUWSS5MPDLmdBiHhAk9cs0nEtYIavWSemue3vvLaKJWv1eCR1Fp0sNDLauZ1c= 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=TmLiUMq0; 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="TmLiUMq0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144126; bh=BLWs61GCfo1s83BYplKIk5R6XzcPP/MZOpccHPKGpKE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TmLiUMq0xWsF0E9+PlQjpTeSBVcfz2AR/Z5G2scYYALnGwZWRbF3NDCkmvXkTvkDo QlSp4nIxoxlhdjpGLAw5yJrUcnoXB4UYvydpbn5NfTzvLtijbGNVEmvLsxnfzUlbD6 2aFzva97+X2xEpUx80XYuBf6HwWRqd7+yeJGdogyNBWL6mAtmdDfBQjE+MdDYJ0qvi ZgnFuPTj0anBcf1/8YyNEnskJ44VY3QmWlsGBUDDvjkzszOeruNFeTKgyt4oEj848H SC1phQ19TgdcdA4HfZG27kYTUBcWt1djSrqmcuKa2EAR6nDJjsI0DrxrLIZyVzcEIJ wN3QKevK6qHhg== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id D5C2817E14F2; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 50CAC48002B; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:32 +0100 Subject: [PATCH 6/7] phy: rockchip: usbdp: Use FIELD_PREP_WM16_CONST 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: <20260203-rockchip-usbdp-cleanup-v1-6-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.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=1489; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=BLWs61GCfo1s83BYplKIk5R6XzcPP/MZOpccHPKGpKE=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX3MUc2X1aPba3TUi9akL8o1eyn++X8TZ sB4R0CPwVLu/YkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qaSc0QAJ2khlQq0jpo1gYronwaW4JYd4EpzVPJ4b+2HnQkpKvbgjABBbm/zmh61n8+aPvCh+i PfmE9NY8o1/PIOy2Cy0P3qoa/ZBkvMpGVWP0AZBCaX1SRJH9HBVgKEXzbPIoVUJQbGWNwTrH/SP iC1R1jDQzWWhlfMR2hYLbigEIYDpjmG8G2lf6ceNOG95OvQggazuOWJSXRwVIqnfg68tdmRchxX 8JfCZbtx3AKW7KZpeD3ijJI0UzTS9e6aBwExKcWhhyPgY0TrfDpLEGTZEuq8XCBnVlGohgvBnFw XV7SzzAcV7CxcDUJWMsl7g+Ci5/IuMr7oaCKNpxHZ3yBqmDoXQcu6MQWhBtksleN29zgN4pFNod RX60BISHWIQdQsiZHbYT7bGDiEM/MK7rdiYmEFw5U7PjnNLadeZRbXpjq/EtrsgO7+y6QLY0NHG sscrrCrx3uX0n7pGgyS1c3FO4wpYlqVsDB9km7JcYxcGhSoMd9RAQ6sqOSV5uWBJ3zR362xOPuC 78Esf8oCc1IjD/lqjPxOeAckwJtpknHfdzsx9vKXQq8tDkuMiiSob9Stj0PuJind045uKz/IXAQ nxhsJ4SATg4+q5+uyKFGFJUudEmRhtM1qEdhgIl9gvVxJOfHlFdlRRtnxGC4IraS3/T31NVAbwq 5JlUeO/0ljMMcvLt5OfsoQQ== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A Cleanup code by replacing open-coded version of FIELD_PREP_WM16_CONST with the existing helper macro. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index 4388105dd8ce..9291f56120f1 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -75,7 +76,6 @@ #define TRSV_LN2_MON_RX_CDR_DONE_OFFSET 0x1b84 /* trsv_reg06E1 */ #define TRSV_LN2_MON_RX_CDR_LOCK_DONE BIT(0) =20 -#define BIT_WRITEABLE_SHIFT 16 #define PHY_AUX_DP_DATA_POL_NORMAL 0 #define PHY_AUX_DP_DATA_POL_INVERT 1 #define PHY_LANE_MUX_USB 0 @@ -104,8 +104,8 @@ struct rk_udphy_grf_reg { #define _RK_UDPHY_GEN_GRF_REG(offset, mask, disable, enable) \ {\ offset, \ - FIELD_PREP_CONST(mask, disable) | (mask << BIT_WRITEABLE_SHIFT), \ - FIELD_PREP_CONST(mask, enable) | (mask << BIT_WRITEABLE_SHIFT), \ + FIELD_PREP_WM16_CONST(mask, disable), \ + FIELD_PREP_WM16_CONST(mask, enable), \ } =20 #define RK_UDPHY_GEN_GRF_REG(offset, bitend, bitstart, disable, enable) \ --=20 2.51.0 From nobody Sun Feb 8 18:24:38 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 7AC5636AB53 for ; Tue, 3 Feb 2026 18:42:10 +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=1770144132; cv=none; b=uq7jeT2XmQD4UHMqjdUM44z3upjuMrdybOxY/ODaxmUbepdjDumd84Ckvt7iARpmVy6JK+2NFezZmzGtYDnA8TmhyK6yN6kGZNvoGDL4JS/8eBCq2Tub7CjbUG3uDoB9YHlfIqeqPRlIzLacC7OYSj/d3LPqEsSpFy6qb/RsYOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770144132; c=relaxed/simple; bh=23Ek+D0JUr6WySL1/oiXZ9jAGAqckHYeinx/bYUytek=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kkm2FOy9WwO8zPlP7Vmx2oEj+OPXG4tIRrmAoYnvpG3OJNm92QrXgsZxxi7eVRI2kOwUOdKgMqjZGEYLugfCZvr6wdt/UhrHvJqLwLaLEUKTtB+jg7FwWtQuSObQAqTHGasgp7t4oiwH7Um9tz/kLdkjTfQecgFpcHfTOPX7Elo= 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=LZ3YUNoI; 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="LZ3YUNoI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1770144126; bh=23Ek+D0JUr6WySL1/oiXZ9jAGAqckHYeinx/bYUytek=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LZ3YUNoIjfe62GY/PTrB0kGX8RVx27yqQB2LtH+x0ut5v9/S5oUEx6toKK2UGMfuR x2zo40TJPFmc9tvZ9/JBTGMDHsbW/GgedXSHudR68//MQfEzHhTmohbv0Ofc6Oxe/5 yH+yTI+c5JdvAwz6gyG5ADWVwZr80UQGB46YP6/iZ85+X3o98pjMEwYOeBue/rP/gA +Inh1nRmSraAfntjOag3ddsYFt6da5Pb2eDityEF45LrISsO794c8Sw52NSJRHNG50 g54Vxv0QAOati4yke6VOCE8VD4efUlmd23wBp2HbpRhwfDwyHOiZLBQTVTu0hpCVeo D+EaZx0zi1GJw== Received: from jupiter.universe (dyndsl-091-248-189-143.ewe-ip-backbone.de [91.248.189.143]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id DD7B317E14F5; Tue, 3 Feb 2026 19:42:05 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 5232E48002C; Tue, 03 Feb 2026 19:42:05 +0100 (CET) From: Sebastian Reichel Date: Tue, 03 Feb 2026 19:41:33 +0100 Subject: [PATCH 7/7] phy: rockchip: usbdp: Cleanup DP lane selection function 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: <20260203-rockchip-usbdp-cleanup-v1-7-16a6f92ed176@collabora.com> References: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> In-Reply-To: <20260203-rockchip-usbdp-cleanup-v1-0-16a6f92ed176@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner Cc: Andy Yan , Yubing Zhang , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.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=1832; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=23Ek+D0JUr6WySL1/oiXZ9jAGAqckHYeinx/bYUytek=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGmCQX3cO7VLg0fclziNsqIVVJmzkjWkZbw/p k132EykkHZHdIkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJpgkF9AAoJENju1/PI O/qa/VsP/2A9qRkKR72MXe0pio64MaCVEoJrIbjWckqT0khGMqfW9rTW133HGYeaPEb616+Hei8 cHhJ3wfQc/3Nb294o6HL8mFxXkMYta5h8K1m1XCT585AXWyL3z1oaC6e708Z86FiFp7gyNXxGgY ODyjDivQXaKlVhWWvKbyfwj8lE/DgpG7Paf7trpIhhKWDeeP4A9zSUoVz/yaOr9NE0W3cCUycw5 Utna+Yry6RWSXa/m3gXkXhHnRFpsFv7aGEnjbPUis6N7M2b7/YH8g25jaOgVFVRHvzWre2vrYGI VpUJUhE5azrTX4BtPAMFXCldNmASDci1DTXjsqn5LVXbCZ+Qe9tx0cIXfcQLP3Y/F5vm6qTQcQl T/D6lX0+bznIceMGqZG+9k+JBjaQGO0xRW7eLcA90vlkJtFxJJ8WetSvQ51jsGLVnIdldzbqYth AFKjSbZYsVXCuqEio5ifeaqXyV/CocMNkVFyXGbXGVze/wQq7/marOaygQOAnRvAwX+7yAB0OPN QVRCnp9vjkmWK1+MibaQkCd4oTA9DP2DKb5G8RYwAA0nTeHp4dcIzxlNE1fugWV6c0E9PkmslKJ yjLT2hcau4ZTVhyVfPljBBSmqTIF3Qgekvspis8xok4XK2G6hnBhASFDUg7L43/yWK0RK4ug1q0 wy6Ii/u+oqrtrx7ih5Y8nnw== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A Use FIELD_PREP_WM16() helpers to simplify the DP lane selection logic. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockch= ip/phy-rockchip-usbdp.c index 9291f56120f1..ebc11d06e5ea 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -550,30 +550,16 @@ static void rk_udphy_usb_bvalid_enable(struct rk_udph= y *udphy, u8 enable) static void rk_udphy_dp_lane_select(struct rk_udphy *udphy) { const struct rk_udphy_cfg *cfg =3D udphy->cfgs; - u32 value =3D 0; - - switch (udphy->dp_lanes) { - case 4: - value |=3D 3 << udphy->dp_lane_sel[3] * 2; - value |=3D 2 << udphy->dp_lane_sel[2] * 2; - fallthrough; - - case 2: - value |=3D 1 << udphy->dp_lane_sel[1] * 2; - fallthrough; + u32 value =3D FIELD_PREP_WM16(DP_LANE_SEL_ALL, 0); + int i; =20 - case 1: - value |=3D 0 << udphy->dp_lane_sel[0] * 2; - break; + for (i =3D 0; i < udphy->dp_lanes; i++) + value |=3D field_prep(DP_LANE_SEL_N(udphy->dp_lane_sel[i]), i); =20 - default: - break; - } + value |=3D FIELD_PREP_WM16(DP_AUX_DIN_SEL, udphy->dp_aux_din_sel); + value |=3D FIELD_PREP_WM16(DP_AUX_DOUT_SEL, udphy->dp_aux_dout_sel); =20 - regmap_write(udphy->vogrf, cfg->vogrfcfg[udphy->id].dp_lane_reg, - ((DP_AUX_DIN_SEL | DP_AUX_DOUT_SEL | DP_LANE_SEL_ALL) << 16) | - FIELD_PREP(DP_AUX_DIN_SEL, udphy->dp_aux_din_sel) | - FIELD_PREP(DP_AUX_DOUT_SEL, udphy->dp_aux_dout_sel) | value); + regmap_write(udphy->vogrf, cfg->vogrfcfg[udphy->id].dp_lane_reg, value); } =20 static void rk_udphy_dp_lane_enable(struct rk_udphy *udphy, int dp_lanes) --=20 2.51.0