Commit b797be1d authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Paul Walmsley
Browse files

ARM: OMAP2+: hwmod: Invoke init_clkdm before other init functions 



Without this kernel would crash, since clkdm inside omap_hwmod
is accessed in some of the init functions like, _init_main_clk.

So call init_clkdm before _init_main_clk().

Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarMike Turquette <mturquette@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 8577413c

arch/arm/mach-omap2/omap_hwmod.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1519,11 +1519,12 @@ static int _init_clocks(struct omap_hwmod *oh, void *data) 




	pr_debug("omap_hwmod: %s: looking up clocks\n", oh->name);

	pr_debug("omap_hwmod: %s: looking up clocks\n", oh->name);





	if (soc_ops.init_clkdm)

		ret |= soc_ops.init_clkdm(oh);



	ret |= _init_main_clk(oh);

	ret |= _init_main_clk(oh);

	ret |= _init_interface_clks(oh);

	ret |= _init_interface_clks(oh);

	ret |= _init_opt_clks(oh);

	ret |= _init_opt_clks(oh);

	if (soc_ops.init_clkdm)

		ret |= soc_ops.init_clkdm(oh);





	if (!ret)

	if (!ret)

		oh->_state = _HWMOD_STATE_CLKS_INITED;

		oh->_state = _HWMOD_STATE_CLKS_INITED;