[PATCH v2 3/9] pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed

[Kever Yang]

Hi Jonas,

On 2023/5/18 06:53, Jonas Karlman wrote:
> The vpcie3v3 regulator is typically a fixed regulator controlled using
> gpio. Change to use enable and disable calls on the regulator instead
> of trying to set a voltage value.
>
> Also remove the delay to match linux driver, for a fixed regulator the
> startup-delay-us prop can be used in case a startup delay is needed.
> Limited testing on ROCK 3A, ROCK 5B, Quartz64, Odroid-M1 has shown that
> this delay was not needed.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2:
> - Update commit message
>
>   drivers/pci/pcie_dw_rockchip.c | 17 +++++++----------
>   1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c
> index 83737e62bc6a..1b8a1409f6df 100644
> --- a/drivers/pci/pcie_dw_rockchip.c
> +++ b/drivers/pci/pcie_dw_rockchip.c
> @@ -288,21 +288,16 @@ static int rockchip_pcie_init_port(struct udevice *dev)
>   	struct rk_pcie *priv = dev_get_priv(dev);
>   
>   	/* Set power and maybe external ref clk input */
> -	if (priv->vpcie3v3) {
> -		ret = regulator_set_value(priv->vpcie3v3, 3300000);
> -		if (ret) {
> -			dev_err(priv->dw.dev, "failed to enable vpcie3v3 (ret=%d)\n",
> -				ret);
> -			return ret;
> -		}
> +	ret = regulator_set_enable_if_allowed(priv->vpcie3v3, true);
> +	if (ret && ret != -ENOSYS) {
> +		dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n", ret);
> +		return ret;
>   	}
>   
> -	udelay(MACRO_US * 1000);
> -
>   	ret = generic_phy_init(&priv->phy);
>   	if (ret) {
>   		dev_err(dev, "failed to init phy (ret=%d)\n", ret);
> -		return ret;
> +		goto err_disable_regulator;
>   	}
>   
>   	ret = generic_phy_power_on(&priv->phy);
> @@ -345,6 +340,8 @@ err_power_off_phy:
>   	generic_phy_power_off(&priv->phy);
>   err_exit_phy:
>   	generic_phy_exit(&priv->phy);
> +err_disable_regulator:
> +	regulator_set_enable_if_allowed(priv->vpcie3v3, false);
>   
>   	return ret;
>   }