Commit df6b3352 authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones

mfd: arizona: Disable DCVDD before we destroy the MFD

As DCVDD is probably supplied by a child of the MFD device move its
disable to before we destroy the MFD children as the regulator likely
won't exist after that.
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b804020a
...@@ -1025,6 +1025,8 @@ int arizona_dev_exit(struct arizona *arizona) ...@@ -1025,6 +1025,8 @@ int arizona_dev_exit(struct arizona *arizona)
{ {
pm_runtime_disable(arizona->dev); pm_runtime_disable(arizona->dev);
regulator_disable(arizona->dcvdd);
mfd_remove_devices(arizona->dev); mfd_remove_devices(arizona->dev);
arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona); arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona);
arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona); arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona);
...@@ -1032,7 +1034,7 @@ int arizona_dev_exit(struct arizona *arizona) ...@@ -1032,7 +1034,7 @@ int arizona_dev_exit(struct arizona *arizona)
arizona_irq_exit(arizona); arizona_irq_exit(arizona);
if (arizona->pdata.reset) if (arizona->pdata.reset)
gpio_set_value_cansleep(arizona->pdata.reset, 0); gpio_set_value_cansleep(arizona->pdata.reset, 0);
regulator_disable(arizona->dcvdd);
regulator_bulk_disable(ARRAY_SIZE(arizona->core_supplies), regulator_bulk_disable(ARRAY_SIZE(arizona->core_supplies),
arizona->core_supplies); arizona->core_supplies);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment