Re: [PATCH 2/2] mfd: arizona: Handle probe deferral for reset GPIO

[Lee Jones]

On Tue, 20 Sep 2016, Charles Keepax wrote:

> The Arizona CODECs will generally function correctly without a reset line
> although it is strongly advised to have one, as such we do allow the system
> to boot if the reset gpio is missing or incorrectly specified.  However
> we should fail probe if we get a probe deferral request, this patch adds
> handling for this case.
> 
> Reported-by: Richard Fitzgerald <rf@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/mfd/arizona-core.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index f466f29..d18f3b1 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -813,7 +813,9 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
>  	int count = 0;
>  
>  	pdata->reset = of_get_named_gpio(arizona->dev->of_node, "wlf,reset", 0);
> -	if (pdata->reset < 0) {
> +	if (pdata->reset == -EPROBE_DEFER) {
> +		return pdata->reset;
> +	} else if (pdata->reset < 0) {
>  		dev_err(arizona->dev, "Reset gpio missing/malformed: %d\n",
>  			pdata->reset);
>  
> @@ -1011,11 +1013,14 @@ int arizona_dev_init(struct arizona *arizona)
>  	dev_set_drvdata(arizona->dev, arizona);
>  	mutex_init(&arizona->clk_lock);
>  
> -	if (dev_get_platdata(arizona->dev))
> +	if (dev_get_platdata(arizona->dev)) {
>  		memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
>  		       sizeof(arizona->pdata));
> -	else
> -		arizona_of_get_core_pdata(arizona);
> +	} else {
> +		ret = arizona_of_get_core_pdata(arizona);
> +		if (ret < 0)
> +			return ret;
> +	}
>  
>  	BUILD_BUG_ON(ARRAY_SIZE(arizona->mclk) != ARRAY_SIZE(mclk_name));
>  	for (i = 0; i < ARRAY_SIZE(arizona->mclk); i++) {

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog