From nobody Mon Apr 6 10:43:31 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 26ED93D6484; Fri, 13 Mar 2026 17:57:26 +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=1773424647; cv=none; b=eEjkRcinVHZBgHVHko0sR2PYodBXqbp+tlZcAXE9eyUMxMItJAM2vWHydC4p1t24fPh/TytS+LuoGhXoExxGp0/v87IuJhyhTdw8u5u9jajkzA8bDlmExwO4rwIKDaFxao+4KDVqifz7YHU3RFYbHszJh+EOciwtQfg3Z3BZBd4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773424647; c=relaxed/simple; bh=wJZwMH5VNSE/o5UNMK6zuMUZDJCLHOUN4lmKhidacts=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XGM1IK8SibYGYRk6TSIlIMnw3K/gCeAEurHn5eUlJsYyxarmK5t4b1G/H37NrfpELN3g93tkeCQuv4Le4/vueAcvI4qvCHel2Un1w2IrINE9sutXuFkrKj6ntD5IK1yE1QRQ/JiFTcUkSzhD7lGzH8tSkNpUXStO/WTV8jpOmWU= 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=WvnYFtbY; 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="WvnYFtbY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1773424641; bh=wJZwMH5VNSE/o5UNMK6zuMUZDJCLHOUN4lmKhidacts=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WvnYFtbY57K+ac6FBs3eg5Lo+L9B+Ldzkxlrd710Tm8UkNxNYorM6YKqV62SXX41e y5FN1rUiBcQKuHTxi/ZPlvzR0amg0lFIskIrlIb3ZuTXbxq4XW6vVOivqj/HZWjnT6 b70KZnYZyuTf42231rWsQ9rk5T2vvQrIbZb5dPmHQ0sqJ8+DCY0J7WaMkM19PgDjYF z2J+zXdLmFlu3BIYv9cI/1ZzBpuY6baDHVEmR22Sa5ebDqwzvQJ2mhahf89t8D+0S+ 2JIQNIvfwrknLhOew5mPeJhe8QiY3geCgcz5mTdaSRNQBdlh73+JTHaSYDmtN7aP1W Of/3wPaZZQKBw== Received: from jupiter.universe (dyndsl-091-248-210-078.ewe-ip-backbone.de [91.248.210.78]) (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 D6AA817E13A8; Fri, 13 Mar 2026 18:57:21 +0100 (CET) Received: by jupiter.universe (Postfix, from userid 1000) id 2EE5C48002F; Fri, 13 Mar 2026 18:57:21 +0100 (CET) From: Sebastian Reichel Date: Fri, 13 Mar 2026 18:57:18 +0100 Subject: [PATCH v3 09/12] 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: <20260313-rockchip-usbdp-cleanup-v3-9-3e8fe89a35b5@collabora.com> References: <20260313-rockchip-usbdp-cleanup-v3-0-3e8fe89a35b5@collabora.com> In-Reply-To: <20260313-rockchip-usbdp-cleanup-v3-0-3e8fe89a35b5@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner , Frank Wang , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Andy Yan , Dmitry Baryshkov , Yubing Zhang , Alexey Charkov , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, devicetree@vger.kernel.org, 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=wJZwMH5VNSE/o5UNMK6zuMUZDJCLHOUN4lmKhidacts=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGm0UAByLSx+ishzSoLVEUgcjdh2ubFoSoBs7 Hv06J44ZO+MSokCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJptFAAAAoJENju1/PI O/qaj9AP+wXt6JbzZqt5ymAqbDIEAzGKOq5pWCk50mwOjJCmcJYUqZHu6mAb/tOjxQQ1LC39p4z nP41t8odHGLzET3d9aM6uhh7Sb2A6fmQA3hsXufUL2nlh/ugC9gpYMBt6fdZLtwBhFLvAoGOM3F K8DyQNgGvt0ddN6hmLsYt9gMmBCrqFn0C0elli8oBDGnIWxCQwHsdXRrQxOhHJV54i0tjgq9n/A 9iw8J1vZsYhXL7Py2znMkv6Hhf22wYSukwUtO1BJoPbxC9aum+w2kNTaWeb7+opf+oCH9lYzm0e T34PDSfNE3Oqf9yt0b5LTYyAlz6cyvyNgIZVDS24iJu7cibB/ItpZrXZF4ooQiQ3369ukvPFrha 3+1hf+2vBGHOTln/w4ahfaFmAzJS36Ru0RJD1GpZjJokbDjoleSBBW0/f0cyh5WDcm5HoQQcEVQ U9JpdWpxXC5akvHZPbfm/lqaf8G3CFPfesxuJp4WCY+Hp2tiUguTVYAtsRz3h0znZhxbaqKYfXV N3Pj5A6n2GiK6cAGyS5KDl+No5YFspIHQBv/wIOLmJNxjYEGagOHsc+/sUvmiUjvj2CS/2S7Cxc hCJkmrNqdKcfPSKuYpJaN+BewmBNXrcfq9JOAwkiGvlnqL1rcVA0EUJ+v9GDCeP8+yQyk6Lh+2b qby/Zw9IdcmtEe6att18n8A== 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 6d7ca11b308e..1bfc365e2b2c 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