Commit 0caf0008 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-ti' into clk-next 

* clk-ti:
  clk: Remove CLK_IS_BASIC clk flag
  clk: ti: dra7: disable the RNG and TIMER12 clkctrl clocks on HS devices
  clk: ti: dra7x: prevent non-existing clkctrl clocks from registering
  ARM: omap2+: hwmod: drop CLK_IS_BASIC flag usage
  clk: ti: export the omap2_clk_is_hw_omap call
parents ff060019 90b6c5c7

arch/arm/mach-omap2/clock.c

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ void __init ti_clk_init_features(void) 
	if (cpu_is_omap343x())

		features.flags |= TI_CLK_DPLL_HAS_FREQSEL;



	if (omap_type() == OMAP2_DEVICE_TYPE_GP)

		features.flags |= TI_CLK_DEVICE_TYPE_GP;



	/* Idlest value for interface clocks.

	 * 24xx uses 0 to indicate not ready, and 1 to indicate ready.

	 * 34xx reverses this, just to keep us on our toes

arch/arm/mach-omap2/omap_hwmod.c

+2 −2
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static struct clockdomain *_get_clkdm(struct omap_hwmod *oh) 
	if (oh->clkdm) {

		return oh->clkdm;

	} else if (oh->_clk) {

		if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC)

		if (!omap2_clk_is_hw_omap(__clk_get_hw(oh->_clk)))

			return NULL;

		clk = to_clk_hw_omap(__clk_get_hw(oh->_clk));

		return clk->clkdm;

arch/mips/alchemy/common/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static struct clk __init *alchemy_clk_setup_cpu(const char *parent_name, 
	id.name = ALCHEMY_CPU_CLK;

	id.parent_names = &parent_name;

	id.num_parents = 1;

	id.flags = CLK_IS_BASIC;

	id.flags = 0;

	id.ops = &alchemy_clkops_cpu;

	h->init = &id;

drivers/clk/clk-composite.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name, 
		return ERR_PTR(-ENOMEM);



	init.name = name;

	init.flags = flags | CLK_IS_BASIC;

	init.flags = flags;

	init.parent_names = parent_names;

	init.num_parents = num_parents;

	hw = &composite->hw;

drivers/clk/clk-divider.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static struct clk_hw *_register_divider(struct device *dev, const char *name, 
		init.ops = &clk_divider_ro_ops;

	else

		init.ops = &clk_divider_ops;

	init.flags = flags | CLK_IS_BASIC;

	init.flags = flags;

	init.parent_names = (parent_name ? &parent_name: NULL);

	init.num_parents = (parent_name ? 1 : 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE