Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: amlogic: meson8b-usb2: Use FIELD_PREP instead of _SHIFT macros

This simplifies the code by re-using the FIELD_PREP helper. No
functional changes inteded.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Anand Moon <linux.amoon@gmail.com>
Link: https://lore.kernel.org/r/20250329190712.858349-2-martin.blumenstingl@googlemail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Martin Blumenstingl and committed by
Vinod Koul
ff02c5a3 588d5d20

+3 -4
+3 -4
drivers/phy/amlogic/phy-meson8b-usb2.c
··· 5 5 * Copyright (C) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com> 6 6 */ 7 7 8 + #include <linux/bitfield.h> 8 9 #include <linux/clk.h> 9 10 #include <linux/delay.h> 10 11 #include <linux/io.h> ··· 40 39 #define REG_CTRL_TX_BITSTUFF_ENN BIT(18) 41 40 #define REG_CTRL_COMMON_ON BIT(19) 42 41 #define REG_CTRL_REF_CLK_SEL_MASK GENMASK(21, 20) 43 - #define REG_CTRL_REF_CLK_SEL_SHIFT 20 44 42 #define REG_CTRL_FSEL_MASK GENMASK(24, 22) 45 - #define REG_CTRL_FSEL_SHIFT 22 46 43 #define REG_CTRL_PORT_RESET BIT(25) 47 44 #define REG_CTRL_THREAD_ID_MASK GENMASK(31, 26) 48 45 ··· 169 170 REG_CONFIG_CLK_32k_ALTSEL); 170 171 171 172 regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_REF_CLK_SEL_MASK, 172 - 0x2 << REG_CTRL_REF_CLK_SEL_SHIFT); 173 + FIELD_PREP(REG_CTRL_REF_CLK_SEL_MASK, 0x2)); 173 174 174 175 regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_FSEL_MASK, 175 - 0x5 << REG_CTRL_FSEL_SHIFT); 176 + FIELD_PREP(REG_CTRL_FSEL_MASK, 0x5)); 176 177 177 178 /* reset the PHY */ 178 179 regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET,