[PATCH 2/2] phy: amlogic: meson8b-usb2: Use the regmap_{clear,set}_bits helpers
neil.armstrong at linaro.org
neil.armstrong at linaro.org
Thu Jan 2 01:41:10 PST 2025
On 31/12/2024 20:17, Martin Blumenstingl wrote:
> These require less code, reduce the chance of typos and overall make the
> intent clearer. No functional changes.
>
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
> ---
> drivers/phy/amlogic/phy-meson8b-usb2.c | 28 ++++++++++----------------
> 1 file changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c
> index d9c761b7c15c..a553231a9f7c 100644
> --- a/drivers/phy/amlogic/phy-meson8b-usb2.c
> +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c
> @@ -165,8 +165,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
> return ret;
> }
>
> - regmap_update_bits(priv->regmap, REG_CONFIG, REG_CONFIG_CLK_32k_ALTSEL,
> - REG_CONFIG_CLK_32k_ALTSEL);
> + regmap_set_bits(priv->regmap, REG_CONFIG, REG_CONFIG_CLK_32k_ALTSEL);
>
> regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_REF_CLK_SEL_MASK,
> FIELD_PREP(REG_CTRL_REF_CLK_SEL_MASK, 0x2));
> @@ -175,23 +174,20 @@ static int phy_meson8b_usb2_power_on(struct phy *phy)
> FIELD_PREP(REG_CTRL_FSEL_MASK, 0x5));
>
> /* reset the PHY */
> - regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET,
> - REG_CTRL_POWER_ON_RESET);
> + regmap_set_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET);
> udelay(RESET_COMPLETE_TIME);
> - regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET, 0);
> + regmap_clear_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET);
> udelay(RESET_COMPLETE_TIME);
>
> - regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_SOF_TOGGLE_OUT,
> - REG_CTRL_SOF_TOGGLE_OUT);
> + regmap_set_bits(priv->regmap, REG_CTRL, REG_CTRL_SOF_TOGGLE_OUT);
>
> if (priv->dr_mode == USB_DR_MODE_HOST) {
> - regmap_update_bits(priv->regmap, REG_DBG_UART,
> - REG_DBG_UART_SET_IDDQ, 0);
> + regmap_clear_bits(priv->regmap, REG_DBG_UART,
> + REG_DBG_UART_SET_IDDQ);
>
> if (priv->match->host_enable_aca) {
> - regmap_update_bits(priv->regmap, REG_ADP_BC,
> - REG_ADP_BC_ACA_ENABLE,
> - REG_ADP_BC_ACA_ENABLE);
> + regmap_set_bits(priv->regmap, REG_ADP_BC,
> + REG_ADP_BC_ACA_ENABLE);
>
> udelay(ACA_ENABLE_COMPLETE_TIME);
>
> @@ -214,17 +210,15 @@ static int phy_meson8b_usb2_power_off(struct phy *phy)
> struct phy_meson8b_usb2_priv *priv = phy_get_drvdata(phy);
>
> if (priv->dr_mode == USB_DR_MODE_HOST)
> - regmap_update_bits(priv->regmap, REG_DBG_UART,
> - REG_DBG_UART_SET_IDDQ,
> - REG_DBG_UART_SET_IDDQ);
> + regmap_set_bits(priv->regmap, REG_DBG_UART,
> + REG_DBG_UART_SET_IDDQ);
>
> clk_disable_unprepare(priv->clk_usb);
> clk_disable_unprepare(priv->clk_usb_general);
> reset_control_rearm(priv->reset);
>
> /* power off the PHY by putting it into reset mode */
> - regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET,
> - REG_CTRL_POWER_ON_RESET);
> + regmap_set_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET);
>
> return 0;
> }
Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>
More information about the linux-arm-kernel
mailing list