diff options
| author | Lee Jones <lee.jones@linaro.org> | 2019-11-07 12:19:50 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2019-11-11 12:23:57 +0100 |
| commit | 6b5c350648b857047b47acf74a57087ad27d6183 (patch) | |
| tree | c91bd3a40ea20739ba8824bb854eddadb4dd5071 /drivers/mfd | |
| parent | dt-bindings: mfd: max77693: Fix missing curly brace (diff) | |
| download | linux-6b5c350648b857047b47acf74a57087ad27d6183.tar.xz linux-6b5c350648b857047b47acf74a57087ad27d6183.zip | |
mfd: mfd-core: Honour Device Tree's request to disable a child-device
Until now, MFD has assumed all child devices passed to it (via
mfd_cells) are to be registered. It does not take into account
requests from Device Tree and the like to disable child devices
on a per-platform basis.
Well now it does.
Link: https://www.spinics.net/lists/arm-kernel/msg366309.html
Link: https://lkml.org/lkml/2019/8/22/1350
Reported-by: Barry Song <Baohua.Song@csr.com>
Reported-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Tested-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mfd-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index cb3e0a14bbdd..f5a73af60dd4 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -152,6 +152,11 @@ static int mfd_add_device(struct device *parent, int id, if (parent->of_node && cell->of_compatible) { for_each_child_of_node(parent->of_node, np) { if (of_device_is_compatible(np, cell->of_compatible)) { + if (!of_device_is_available(np)) { + /* Ignore disabled devices error free */ + ret = 0; + goto fail_alias; + } pdev->dev.of_node = np; pdev->dev.fwnode = &np->fwnode; break; |