Skip to content

Commit 77b3dda

Browse files
charleskeepaxLee Jones
authored andcommitted
mfd: madera: Improve handling of regulator unbinding
The current unbinding process for Madera has some issues. The trouble is runtime PM is disabled as the first step of the process, but some of the drivers release IRQs causing regmap IRQ to issue a runtime get which fails. To allow runtime PM to remain enabled during mfd_remove_devices, the DCVDD regulator must remain available. In the case of external DCVDD's this is simple, the regulator can simply be disabled/put after the call to mfd_remove_devices. However, in the case of an internally supplied DCVDD the regulator needs to be released after the other MFD children depending on it. Use the new MFD mfd_remove_devices_late functionality to split the DCVDD regulator off from the other drivers. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
1 parent 114294d commit 77b3dda

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

drivers/mfd/madera-core.c

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ static const char * const madera_core_supplies[] = {
4444
};
4545

4646
static const struct mfd_cell madera_ldo1_devs[] = {
47-
{ .name = "madera-ldo1", },
47+
{
48+
.name = "madera-ldo1",
49+
.level = MFD_DEP_LEVEL_HIGH,
50+
},
4851
};
4952

5053
static const char * const cs47l15_supplies[] = {
@@ -743,18 +746,22 @@ int madera_dev_exit(struct madera *madera)
743746
/* Prevent any IRQs being serviced while we clean up */
744747
disable_irq(madera->irq);
745748

746-
/*
747-
* DCVDD could be supplied by a child node, we must disable it before
748-
* removing the children, and prevent PM runtime from turning it back on
749-
*/
750-
pm_runtime_disable(madera->dev);
749+
pm_runtime_get_sync(madera->dev);
751750

752-
clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk);
751+
mfd_remove_devices(madera->dev);
752+
753+
pm_runtime_disable(madera->dev);
753754

754755
regulator_disable(madera->dcvdd);
755756
regulator_put(madera->dcvdd);
756757

757-
mfd_remove_devices(madera->dev);
758+
mfd_remove_devices_late(madera->dev);
759+
760+
pm_runtime_set_suspended(madera->dev);
761+
pm_runtime_put_noidle(madera->dev);
762+
763+
clk_disable_unprepare(madera->mclk[MADERA_MCLK2].clk);
764+
758765
madera_enable_hard_reset(madera);
759766

760767
regulator_bulk_disable(madera->num_core_supplies,

0 commit comments

Comments
 (0)