[PATCH] phy: usb-nop-xceiv: Make the clock always optional

Sascha Hauer sha at pengutronix.de
Thu Dec 10 04:04:51 EST 2020


Hi Jules,

On Wed, Dec 09, 2020 at 02:14:54PM +0100, Jules Maselbas wrote:
> The clock seems to be optional at probe time, if not found it's set
> to NULL. However this was not the case in the function nop_usbphy_init
> which exits with error if the clock cannot be enabled.
> 
> Make the clock optional also during the nop_usbphy_init by trying to
> do the clock init only if the clock has been found during probe.
> 
> Signed-off-by: Jules Maselbas <jmaselbas at kalray.eu>
> ---
>  drivers/phy/usb-nop-xceiv.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/phy/usb-nop-xceiv.c b/drivers/phy/usb-nop-xceiv.c
> index 7ea7d28a2..b549b564b 100644
> --- a/drivers/phy/usb-nop-xceiv.c
> +++ b/drivers/phy/usb-nop-xceiv.c
> @@ -46,9 +46,11 @@ static int nop_usbphy_init(struct phy *phy)
>  	int ret;
>  	struct nop_usbphy *nopphy = phy_get_drvdata(phy);
>  
> -	ret = clk_enable(nopphy->clk);
> -	if (ret < 0)
> -		return ret;
> +	if (nopphy->clk) {
> +		ret = clk_enable(nopphy->clk);
> +		if (ret < 0)
> +			return ret;
> +	}

clk_enable(NULL) returns 0 on purpose, because NULL is handled as a
dummy clock. This change shouldn't be needed.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list