Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae76997 authored by Benoit Cousson's avatar Benoit Cousson Committed by Paul Walmsley
Browse files

OMAP2+: hwmod: Init clkdm field at boot time 



At boot time, lookup the clkdm_name to get the clkdm
structure pointer for further usage.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent a5322c6f

arch/arm/mach-omap2/omap_hwmod.c

+33 −1
Original line number Original line Diff line number Diff line
@@ -990,9 +990,40 @@ static struct omap_hwmod *_lookup(const char *name) 




	return oh;

	return oh;

}

}

/**

 * _init_clkdm - look up a clockdomain name, store pointer in omap_hwmod

 * @oh: struct omap_hwmod *

 *

 * Convert a clockdomain name stored in a struct omap_hwmod into a

 * clockdomain pointer, and save it into the struct omap_hwmod.

 * return -EINVAL if clkdm_name does not exist or if the lookup failed.

 */

static int _init_clkdm(struct omap_hwmod *oh)

{

	if (cpu_is_omap24xx() || cpu_is_omap34xx())

		return 0;



	if (!oh->clkdm_name) {

		pr_warning("omap_hwmod: %s: no clkdm_name\n", oh->name);

		return -EINVAL;

	}



	oh->clkdm = clkdm_lookup(oh->clkdm_name);

	if (!oh->clkdm) {

		pr_warning("omap_hwmod: %s: could not associate to clkdm %s\n",

			oh->name, oh->clkdm_name);

		return -EINVAL;

	}



	pr_debug("omap_hwmod: %s: associated to clkdm %s\n",

		oh->name, oh->clkdm_name);



	return 0;

}





/**

/**

 * _init_clocks - clk_get() all clocks associated with this hwmod

 * _init_clocks - clk_get() all clocks associated with this hwmod. Retrieve as

 * well the clockdomain.

 * @oh: struct omap_hwmod *

 * @oh: struct omap_hwmod *

 * @data: not used; pass NULL

 * @data: not used; pass NULL

 *

 *
@@ -1012,6 +1043,7 @@ static int _init_clocks(struct omap_hwmod *oh, void *data) 
	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);

	ret |= _init_clkdm(oh);





	if (!ret)

	if (!ret)

		oh->_state = _HWMOD_STATE_CLKS_INITED;

		oh->_state = _HWMOD_STATE_CLKS_INITED;

arch/arm/plat-omap/include/plat/omap_hwmod.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -516,6 +516,7 @@ struct omap_hwmod { 
	struct clk			*_clk;

	struct clk			*_clk;

	struct omap_hwmod_opt_clk	*opt_clks;

	struct omap_hwmod_opt_clk	*opt_clks;

	char				*clkdm_name;

	char				*clkdm_name;

	struct clockdomain		*clkdm;

	char				*vdd_name;

	char				*vdd_name;

	struct voltagedomain		*voltdm;

	struct voltagedomain		*voltdm;

	struct omap_hwmod_ocp_if	**masters; /* connect to *_IA */

	struct omap_hwmod_ocp_if	**masters; /* connect to *_IA */