mfd: arizona: Only attempt to parse DT if platform data was not passed
If platform data is passed when probing the device then it should take precedence over Device Tree. This patch saves cycles in the pdata case and prevents error messages when DT is not passed. Reported-by: Mark Brown <broonie@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
5e172d7518
commit
22d7dc8aba
|
@ -607,11 +607,11 @@ int arizona_dev_init(struct arizona *arizona)
|
|||
dev_set_drvdata(arizona->dev, arizona);
|
||||
mutex_init(&arizona->clk_lock);
|
||||
|
||||
arizona_of_get_core_pdata(arizona);
|
||||
|
||||
if (dev_get_platdata(arizona->dev))
|
||||
memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
|
||||
sizeof(arizona->pdata));
|
||||
else
|
||||
arizona_of_get_core_pdata(arizona);
|
||||
|
||||
regcache_cache_only(arizona->regmap, true);
|
||||
|
||||
|
|
Loading…
Reference in a new issue