Commit 36bf7a5b authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-uniphier', 'clk-warn-critical', 'clk-ux500', 'clk-kconfig'... 

Merge branches 'clk-uniphier', 'clk-warn-critical', 'clk-ux500', 'clk-kconfig' and 'clk-at91' into clk-next

 - Warn about critical clks that fail to enable or prepare
 - Detect more PRMCU variants in ux500 driver

* clk-uniphier:
  clk: uniphier: Add SCSSI clock gate for each channel

* clk-warn-critical:
  clk: Warn about critical clks that fail to enable
  clk: Don't try to enable critical clocks if prepare failed
  clk: tegra: Fix double-free in tegra_clk_init()
  clk: samsung: exynos5420: Keep top G3D clocks enabled
  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

* clk-ux500:
  clk: ux500: Fix up the SGA clock for some variants

* clk-kconfig:
  clk: Fix Kconfig indentation

* clk-at91:
  clk: at91: sam9x60: fix programmable clock prescaler
  clk: at91: sam9x60-pll: adapt PMC_PLL_ACR default value
parents 28db9a8c 1ec09a2e 2d269992 248fdcc7 333d2d19 66d9f521

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/clk-sam9x60-pll.c

+6 −2
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
#define		PMC_PLL_CTRL1_MUL_MSK		GENMASK(30, 24)



#define PMC_PLL_ACR	0x18

#define		PMC_PLL_ACR_DEFAULT		0x1b040010UL

#define		PMC_PLL_ACR_DEFAULT_UPLL	0x12020010UL

#define		PMC_PLL_ACR_DEFAULT_PLLA	0x00020010UL

#define		PMC_PLL_ACR_UTMIVR		BIT(12)

#define		PMC_PLL_ACR_UTMIBG		BIT(13)

#define		PMC_PLL_ACR_LOOP_FILTER_MSK	GENMASK(31, 24)
@@ -88,7 +89,10 @@ static int sam9x60_pll_prepare(struct clk_hw *hw) 
	}



	/* Recommended value for PMC_PLL_ACR */

	val = PMC_PLL_ACR_DEFAULT;

	if (pll->characteristics->upll)

		val = PMC_PLL_ACR_DEFAULT_UPLL;

	else

		val = PMC_PLL_ACR_DEFAULT_PLLA;

	regmap_write(regmap, PMC_PLL_ACR, val);



	regmap_write(regmap, PMC_PLL_CTRL1,

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);