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

Commit 75d43340 authored by Paul Walmsley's avatar Paul Walmsley Committed by paul
Browse files

OMAP2xxx clock: remove implicit dependency between rate CPU flag and clkdev_omap CPU flag 



cpu_mask is reused in the OMAP2xxx clock code to match against both the
CPU-specific rate flags (e.g., RATE_IN_2420) and the OMAP clkdev integration
code CPU flags (e.g., CK_242X).  This means that any patch that renumbers the
CK_* macros, as the next patch does, will probably break.  This patch
separates the clkdev_omap and clksel_rate CPU type detection flags so
the CK_* macros can be renumbered freely.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 55d8a653

arch/arm/mach-omap2/clock24xx.c

+4 −1
Original line number Diff line number Diff line
@@ -751,13 +751,16 @@ int __init omap2_clk_init(void) 
	struct prcm_config *prcm;

	struct omap_clk *c;

	u32 clkrate;

	u16 cpu_clkflg;



	if (cpu_is_omap242x()) {

		prcm_clksrc_ctrl = OMAP2420_PRCM_CLKSRC_CTRL;

		cpu_mask = RATE_IN_242X;

		cpu_clkflg = CK_242X;

	} else if (cpu_is_omap2430()) {

		prcm_clksrc_ctrl = OMAP2430_PRCM_CLKSRC_CTRL;

		cpu_mask = RATE_IN_243X;

		cpu_clkflg = CK_243X;

	}



	clk_init(&omap2_clk_functions);
@@ -771,7 +774,7 @@ int __init omap2_clk_init(void) 
	propagate_rate(&sys_ck);



	for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++)

		if (c->cpu & cpu_mask) {

		if (c->cpu & cpu_clkflg) {

			clkdev_add(&c->lk);

			clk_register(c->lk.clk);

			omap2_init_clk_clkdm(c->lk.clk);