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

Commit a5ffef6a authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain 



At Tony's request, remove the omap_chip bitmasks from the clockdomain
and clockdomain dependency definitions.  Instead, initialize
clockdomains based on one or more lists that are applicable to a
particular SoC family, variant, and silicon revision.

Tony Lindgren <tony@atomide.com> found a bug in a previous version of this
patch - thanks Tony.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
parent 08cb9703

arch/arm/mach-omap2/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -116,9 +116,12 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \ 
obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= clockdomains2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clockdomains2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain.o \

					   clockdomain2xxx_3xxx.o \

					   clockdomains2xxx_3xxx_data.o

					   clockdomains2xxx_3xxx_data.o \

					   clockdomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

					   clockdomain44xx.o \

					   clockdomains44xx_data.o

arch/arm/mach-omap2/clockdomain.c

+1 −18
Original line number Diff line number Diff line
@@ -73,9 +73,6 @@ static int _clkdm_register(struct clockdomain *clkdm) 
	if (!clkdm || !clkdm->name)

		return -EINVAL;



	if (!omap_chip_is(clkdm->omap_chip))

		return -EINVAL;



	pwrdm = pwrdm_lookup(clkdm->pwrdm.name);

	if (!pwrdm) {

		pr_err("clockdomain: %s: powerdomain %s does not exist\n",
@@ -105,13 +102,10 @@ static struct clkdm_dep *_clkdm_deps_lookup(struct clockdomain *clkdm, 
{

	struct clkdm_dep *cd;



	if (!clkdm || !deps || !omap_chip_is(clkdm->omap_chip))

	if (!clkdm || !deps)

		return ERR_PTR(-EINVAL);



	for (cd = deps; cd->clkdm_name; cd++) {

		if (!omap_chip_is(cd->omap_chip))

			continue;



		if (!cd->clkdm && cd->clkdm_name)

			cd->clkdm = _clkdm_lookup(cd->clkdm_name);
@@ -148,9 +142,6 @@ static void _autodep_lookup(struct clkdm_autodep *autodep) 
	if (!autodep)

		return;



	if (!omap_chip_is(autodep->omap_chip))

		return;



	clkdm = clkdm_lookup(autodep->clkdm.name);

	if (!clkdm) {

		pr_err("clockdomain: autodeps: clockdomain %s does not exist\n",
@@ -182,9 +173,6 @@ void _clkdm_add_autodeps(struct clockdomain *clkdm) 
		if (IS_ERR(autodep->clkdm.ptr))

			continue;



		if (!omap_chip_is(autodep->omap_chip))

			continue;



		pr_debug("clockdomain: adding %s sleepdep/wkdep for "

			 "clkdm %s\n", autodep->clkdm.ptr->name,

			 clkdm->name);
@@ -216,9 +204,6 @@ void _clkdm_del_autodeps(struct clockdomain *clkdm) 
		if (IS_ERR(autodep->clkdm.ptr))

			continue;



		if (!omap_chip_is(autodep->omap_chip))

			continue;



		pr_debug("clockdomain: removing %s sleepdep/wkdep for "

			 "clkdm %s\n", autodep->clkdm.ptr->name,

			 clkdm->name);
@@ -243,8 +228,6 @@ static void _resolve_clkdm_deps(struct clockdomain *clkdm, 
	struct clkdm_dep *cd;



	for (cd = clkdm_deps; cd && cd->clkdm_name; cd++) {

		if (!omap_chip_is(cd->omap_chip))

			continue;

		if (cd->clkdm)

			continue;

		cd->clkdm = _clkdm_lookup(cd->clkdm_name);

arch/arm/mach-omap2/clockdomain.h

+8 −7
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
/**

 * struct clkdm_autodep - clkdm deps to add when entering/exiting hwsup mode

 * @clkdm: clockdomain to add wkdep+sleepdep on - set name member only

 * @omap_chip: OMAP chip types that this autodep is valid on

 *

 * A clockdomain that should have wkdeps and sleepdeps added when a

 * clockdomain should stay active in hwsup mode; and conversely,
@@ -60,14 +59,12 @@ struct clkdm_autodep { 
		const char *name;

		struct clockdomain *ptr;

	} clkdm;

	const struct omap_chip_id omap_chip;

};



/**

 * struct clkdm_dep - encode dependencies between clockdomains

 * @clkdm_name: clockdomain name

 * @clkdm: pointer to the struct clockdomain of @clkdm_name

 * @omap_chip: OMAP chip types that this dependency is valid on

 * @wkdep_usecount: Number of wakeup dependencies causing this clkdm to wake

 * @sleepdep_usecount: Number of sleep deps that could prevent clkdm from idle

 *
@@ -81,7 +78,6 @@ struct clkdm_dep { 
	struct clockdomain *clkdm;

	atomic_t wkdep_usecount;

	atomic_t sleepdep_usecount;

	const struct omap_chip_id omap_chip;

};



/* Possible flags for struct clockdomain._flags */
@@ -101,7 +97,6 @@ struct clkdm_dep { 
 * @clkdm_offs: (OMAP4 only) CM clockdomain register offset

 * @wkdep_srcs: Clockdomains that can be told to wake this powerdomain up

 * @sleepdep_srcs: Clockdomains that can be told to keep this clkdm from inact

 * @omap_chip: OMAP chip types that this clockdomain is valid on

 * @usecount: Usecount tracking

 * @node: list_head to link all clockdomains together

 *
@@ -126,7 +121,6 @@ struct clockdomain { 
	const u16 clkdm_offs;

	struct clkdm_dep *wkdep_srcs;

	struct clkdm_dep *sleepdep_srcs;

	const struct omap_chip_id omap_chip;

	atomic_t usecount;

	struct list_head node;

	spinlock_t lock;
@@ -198,7 +192,8 @@ int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk); 
int clkdm_hwmod_enable(struct clockdomain *clkdm, struct omap_hwmod *oh);

int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh);



extern void __init omap2xxx_clockdomains_init(void);

extern void __init omap242x_clockdomains_init(void);

extern void __init omap243x_clockdomains_init(void);

extern void __init omap3xxx_clockdomains_init(void);

extern void __init omap44xx_clockdomains_init(void);

extern void _clkdm_add_autodeps(struct clockdomain *clkdm);
@@ -208,4 +203,10 @@ extern struct clkdm_ops omap2_clkdm_operations; 
extern struct clkdm_ops omap3_clkdm_operations;

extern struct clkdm_ops omap4_clkdm_operations;



extern struct clkdm_dep gfx_24xx_wkdeps[];

extern struct clkdm_dep dsp_24xx_wkdeps[];

extern struct clockdomain wkup_common_clkdm;

extern struct clockdomain prm_common_clkdm;

extern struct clockdomain cm_common_clkdm;



#endif

arch/arm/mach-omap2/clockdomain2xxx_3xxx.c

+0 −4
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ static int omap2_clkdm_clear_all_wkdeps(struct clockdomain *clkdm) 
	u32 mask = 0;



	for (cd = clkdm->wkdep_srcs; cd && cd->clkdm_name; cd++) {

		if (!omap_chip_is(cd->omap_chip))

			continue;

		if (!cd->clkdm)

			continue; /* only happens if data is erroneous */
@@ -98,8 +96,6 @@ static int omap3_clkdm_clear_all_sleepdeps(struct clockdomain *clkdm) 
	u32 mask = 0;



	for (cd = clkdm->sleepdep_srcs; cd && cd->clkdm_name; cd++) {

		if (!omap_chip_is(cd->omap_chip))

			continue;

		if (!cd->clkdm)

			continue; /* only happens if data is erroneous */

arch/arm/mach-omap2/clockdomain44xx.c

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ static int omap4_clkdm_clear_all_wkup_sleep_deps(struct clockdomain *clkdm) 
	u32 mask = 0;



	for (cd = clkdm->wkdep_srcs; cd && cd->clkdm_name; cd++) {

		if (!omap_chip_is(cd->omap_chip))

			continue;

		if (!cd->clkdm)

			continue; /* only happens if data is erroneous */