summaryrefslogtreecommitdiffstats
path: root/drivers/clk/at91/at91sam9rl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-21 05:55:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-21 05:55:35 -0800
commit12ac9a08fc4cb240a28e6690dec016abd298e52f (patch)
treeeb4aaef51f1390c1b0170cec00b0091298cc0217 /drivers/clk/at91/at91sam9rl.c
parentf1fd1610cbb6655883d1838ac79e53301596685d (diff)
parent781d8cea68ac41d11a80df2a5f5babd584f86447 (diff)
downloadlinux-12ac9a08fc4cb240a28e6690dec016abd298e52f.tar.bz2
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "One core framework fix to walk the orphan list and match up clks to parents when clk providers register the DT provider after registering all their clks (as they should). Then a handful of driver fixes for the qcom, imx, and at91 drivers. The driver fixes are relatively small fixes for incorrect register settings or missing locks causing race conditions" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: qcom: Avoid SMMU/cx gdsc corner cases clk: qcom: gcc-sc7180: Fix setting flag for votable GDSCs clk: Move clk_core_reparent_orphans() under CONFIG_OF clk: at91: fix possible deadlock clk: walk orphan list on clock provider registration clk: imx: pll14xx: fix clk_pll14xx_wait_lock clk: imx: clk-imx7ulp: Add missing sentinel of ulp_div_table clk: imx: clk-composite-8m: add lock to gate/mux
Diffstat (limited to 'drivers/clk/at91/at91sam9rl.c')
-rw-r--r--drivers/clk/at91/at91sam9rl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c
index 0ac34cdaa106..77fe83a73bf4 100644
--- a/drivers/clk/at91/at91sam9rl.c
+++ b/drivers/clk/at91/at91sam9rl.c
@@ -83,7 +83,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
return;
mainxtal_name = of_clk_get_parent_name(np, i);
- regmap = syscon_node_to_regmap(np);
+ regmap = device_node_to_regmap(np);
if (IS_ERR(regmap))
return;