Commit 12ac9a08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f1fd1610 781d8cea

drivers/clk/at91/at91sam9260.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void __init at91sam926x_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;

drivers/clk/at91/at91sam9rl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/clk/at91/at91sam9x5.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void __init at91sam9x5_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;

drivers/clk/at91/pmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/clk/at91/sama5d2.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void __init sama5d2_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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE