diff mbox series

[5.4,054/314] mfd: wm8994: Fix driver operation if loaded as modules

Message ID 20200623195341.393311639@linuxfoundation.org
State New
Headers show
Series None | expand

Commit Message

Greg KH June 23, 2020, 7:54 p.m. UTC 
From: Marek Szyprowski <m.szyprowski@samsung.com>


[ Upstream commit d4f9b5428b53dd67f49ee8deed8d4366ed6b1933 ]

WM8994 chip has built-in regulators, which might be used for chip
operation. They are controlled by a separate wm8994-regulator driver,
which should be loaded before this driver calls regulator_get(), because
that driver also provides consumer-supply mapping for the them. If that
driver is not yet loaded, regulator core substitute them with dummy
regulator, what breaks chip operation, because the built-in regulators are
never enabled. Fix this by annotating this driver with MODULE_SOFTDEP()
"pre" dependency to "wm8994_regulator" module.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---
 drivers/mfd/wm8994-core.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.25.1
diff mbox series

Patch

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 1e9fe7d92597e..737dede4a95c3 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -690,3 +690,4 @@  module_i2c_driver(wm8994_i2c_driver);
 MODULE_DESCRIPTION("Core support for the WM8994 audio CODEC");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
+MODULE_SOFTDEP("pre: wm8994_regulator");