diff options
| author |   Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-11-28 11:25:31 +0100 |
|---|---|---|
| committer |   Stephen Boyd <sboyd@kernel.org> | 2019-12-16 09:56:18 -0800 |
| commit | 6956eb33abb5deab2cd916b4c31226b57736bc3c (patch) | |
| tree | bc5073c9253c9c2e6e899ee55186c8de98ffac81 /drivers/clk/at91/pmc.c | |
| parent | Merge tag 'imx-clk-fixes-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-fixes (diff) | |
| download | linux-dev-6956eb33abb5deab2cd916b4c31226b57736bc3c.tar.xz linux-dev-6956eb33abb5deab2cd916b4c31226b57736bc3c.zip | |
clk: at91: fix possible deadlock
Lockdep warns about a possible circular locking dependency because using
syscon_node_to_regmap() will make the created regmap get and enable the
first clock it can parse from the device tree. This clock is not needed to
access the registers and should not be enabled at that time.
Use the recently introduced device_node_to_regmap to solve that as it looks
up the regmap in the same list but doesn't care about the clocks.
Reported-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lkml.kernel.org/r/20191128102531.817549-1-alexandre.belloni@bootlin.com
Tested-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/at91/pmc.c')
| -rw-r--r-- | drivers/clk/at91/pmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 0b03cfae3a9d..b71515acdec1 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -275,7 +275,7 @@ static int __init pmc_register_ops(void) np = of_find_matching_node(NULL, sama5d2_pmc_dt_ids); - pmcreg = syscon_node_to_regmap(np); + pmcreg = device_node_to_regmap(np); if (IS_ERR(pmcreg)) return PTR_ERR(pmcreg); |