Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d336ed authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones
Browse files

mfd: arizona: Handle probe deferral for reset GPIO 



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: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 1961531d

drivers/mfd/arizona-core.c

+9 −4
Original line number Diff line number Diff line
@@ -814,7 +814,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);
@@ -1041,11 +1043,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++) {