From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC69C1B0416 for ; Tue, 31 Dec 2024 19:17:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735672670; cv=none; b=hxw/mcLzuNAzJHHL0Tn1i9+Rbce15wuo+BTNfKtpTdlwdcj2kFG1v7ijZn+1/mGexbXadGu0zAyQrh+RsJEpTzXmYCw9joRB1slO6zyA6H6d+Ot5ZJRo5kLiC41kpUqPd9v5YbvTgxbGOHGSmMCMpC2w/eW9ss9v5188pkV9+7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735672670; c=relaxed/simple; bh=uYncFVEUS1SpYwK+d9P1tbmhBkVF/uSdTL5eyMlHMWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D7sJXzxQdXmfZ+UqPuiBDsFq+fJfWbIkVM1fwIP796FsFjd2SqqaFZCzqljEaQLmUd8egetwpVkK3L7HXAoaqk83qBUIv7xhdInC/1xLRK7JaxCoYopCpLFBvT+Vr3p+bT1E1cX0kGm/G1egpFhqKapFzoRxOeHRa6pDnObcCU0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=FnNOkAq1; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="FnNOkAq1" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5d8de655efaso2445802a12.1 for ; Tue, 31 Dec 2024 11:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1735672667; x=1736277467; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K4dCuqUM4byBfXceaAxAYO1ebj2/JzKW0iFkDEvyBg0=; b=FnNOkAq1Nm7MoPDq9EfI+oqhVNRlOje30A2SvT9cxOL+Ix0I3aPDFpxcWdoNoLZVKJ 7rEecswKtMWzecpE9zB8FRxtn0xmoRvyjYAbigXaWTj4JF8SxNSl7AvXySBahdnps/xA 0eMWjFnRM6DktxZRwcqXqDmFnS+NPVFouSsj+ARWdcfPUg02wxZy83FXF059MKM/RykM 23SexCZuQJX3WgoS6M+j4MyDvdDFYlB5nBuKOpIMZdk/5pBDO2bhX2Dyp2n51mA7R9Hx THw8gqLkc46x8PRzXNJeXo1z3kBO9bhQdpWSi7X/CzjreO6iNV45SlSIZL79vtF+ZGHC 0Tag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735672667; x=1736277467; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K4dCuqUM4byBfXceaAxAYO1ebj2/JzKW0iFkDEvyBg0=; b=ayxHbpr5wcDeI0ZdFBVXLSRuRtQpyTPn93ar+syccunhhaNcO+c5/nS3SNtmKHj/Td Zh/6nym5BE+5uD2S1LYekFAepJTsKRsZeDSXwIMuPG8nYYwXveXKkRlOsVyh8Ds3AY+S K4BzOfnKIQrMd9lAEiUAVnWUXAb/AqLbTAkedFYFyBq6VcGZex3KCesKBBX3L8Iw2lcw gsAsw+Fnmz+Apd1q5XxwqNhbimUXnIRsJjk/UmQ8Uv5ySlee+0XJw8Ti77LpHe4epWKz rzf1za2eGj0KxmyVT/wZOjwpcJmcnJbgjLSVD+E15bp9kQuKgkeQbTDgt/Nw/CCiJ3NE sV/A== X-Forwarded-Encrypted: i=1; AJvYcCVxQwEtu8mQJLDCCqrDIk+pKUBTOVaEKShCxfDwo4hsEHaY5BFUHhurSA6zpg/35INDhoj2WkD4fGPsXRM=@vger.kernel.org X-Gm-Message-State: AOJu0YzN+rBJtJBF/6JBdOiVhB8rV0FMJJArl7mL9f6rwjezOK6f3gFf DNfnSBjdQGhUmaTtXtkEa4Vh7DGhzDUvffLNGVE0FsQKwDiU5osX X-Gm-Gg: ASbGncsUOc5h6mZY5Zjh3zWmNcciQmqfpaHOvZ48ZbRq4ZOHdJi8nv0bNlWdSbU+19w v/HewW3BTWkDPnSu4u7YTnY79xqZVNBgEcM+NWw1Tx4sXMZGem8tzBS718/Q24geYPohKba3zfV Ez+Sc7BF6eNnPnS4R3xpX7A+tNg3GFhaKIt+vKcXa4HQ3s02B8pR12xDmqMiEqoIfYJ+Gc642bz rI/mvTKieOnFuF8MvS2i+2SQNSuuhHs12+ogtYaDYcVQKyujl/U0ws38PAx9hqdhDMX9598Y5Yw imv/L+fzyzt1i2gUqoIefZh06ZvIZOFzajETtM426PjrPJ47YbnDRNkCgHaLAL9PAdoBZXs2oYd IKLz56rFYejfTmE656xemwiuQ X-Google-Smtp-Source: AGHT+IHboD+mOzahTXU+akPfIqU2kT+ne/eUXefsa6NZz0S9CZQPGls2uBwz2MzG5nyqUz0x5vBUKQ== X-Received: by 2002:a05:6402:40d1:b0:5d0:e63e:21c3 with SMTP id 4fb4d7f45d1cf-5d81dd8af3bmr34595687a12.14.1735672666793; Tue, 31 Dec 2024 11:17:46 -0800 (PST) Received: from localhost.localdomain (dynamic-2a02-3100-b300-ce00-1e86-0bff-fe2f-57b7.310.pool.telefonica.de. [2a02:3100:b300:ce00:1e86:bff:fe2f:57b7]) by smtp.googlemail.com with ESMTPSA id 4fb4d7f45d1cf-5d80675a3d2sm16311780a12.16.2024.12.31.11.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2024 11:17:45 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-phy@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, vkoul@kernel.org, kishon@kernel.org, Martin Blumenstingl Subject: [PATCH 1/2] phy: amlogic: meson8b-usb2: Use FIELD_PREP instead of _SHIFT macros Date: Tue, 31 Dec 2024 20:17:17 +0100 Message-ID: <20241231191718.2764065-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241231191718.2764065-1-martin.blumenstingl@googlemail.com> References: <20241231191718.2764065-1-martin.blumenstingl@googlemail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This simplifies the code by re-using the FIELD_PREP helper. No functional changes inteded. Signed-off-by: Martin Blumenstingl --- drivers/phy/amlogic/phy-meson8b-usb2.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c index d63147c41b8c..d9c761b7c15c 100644 --- a/drivers/phy/amlogic/phy-meson8b-usb2.c +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c @@ -5,6 +5,7 @@ * Copyright (C) 2016 Martin Blumenstingl */ +#include #include #include #include @@ -39,9 +40,7 @@ #define REG_CTRL_TX_BITSTUFF_ENN BIT(18) #define REG_CTRL_COMMON_ON BIT(19) #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20) - #define REG_CTRL_REF_CLK_SEL_SHIFT 20 #define REG_CTRL_FSEL_MASK GENMASK(24, 22) - #define REG_CTRL_FSEL_SHIFT 22 #define REG_CTRL_PORT_RESET BIT(25) #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26) @@ -170,10 +169,10 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) REG_CONFIG_CLK_32k_ALTSEL); regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_REF_CLK_SEL_MASK, - 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT); + FIELD_PREP(REG_CTRL_REF_CLK_SEL_MASK, 0x2)); regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_FSEL_MASK, - 0x5 << REG_CTRL_FSEL_SHIFT); + FIELD_PREP(REG_CTRL_FSEL_MASK, 0x5)); /* reset the PHY */ regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET, -- 2.47.1