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

Commit 8098bb0d authored by stanley.miao's avatar stanley.miao Committed by Tony Lindgren
Browse files

OMAP3: Fix a cpu type check problem 



cpu_is_omap3517() and cpu_is_omap3505() are the subgroups of cpu_is_omap34xx(),
so we should check cpu_is_omap3517() and cpu_is_omap3505() first, then check
cpu_is_omap34xx().

Otherwise, All AM35XX (Sitara) clocks do not get registered and device drivers
(ti_hecc, etc...) that depend on those clocks are failing to get the clock and
end up with non working device.

Signed-off-by: default avatarStanley.Miao <stanley.miao@windriver.com>
Tested-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 77c0870c

arch/arm/mach-omap2/clock3xxx_data.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -3417,7 +3417,13 @@ int __init omap3xxx_clk_init(void) 
	struct omap_clk *c;

	struct omap_clk *c;

	u32 cpu_clkflg = CK_3XXX;

	u32 cpu_clkflg = CK_3XXX;





	if (cpu_is_omap34xx()) {

	if (cpu_is_omap3517()) {

		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;

		cpu_clkflg |= CK_3517;

	} else if (cpu_is_omap3505()) {

		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;

		cpu_clkflg |= CK_3505;

	} else if (cpu_is_omap34xx()) {

		cpu_mask = RATE_IN_3XXX;

		cpu_mask = RATE_IN_3XXX;

		cpu_clkflg |= CK_343X;

		cpu_clkflg |= CK_343X;
@@ -3432,12 +3438,6 @@ int __init omap3xxx_clk_init(void) 
			cpu_mask |= RATE_IN_3430ES2PLUS;

			cpu_mask |= RATE_IN_3430ES2PLUS;

			cpu_clkflg |= CK_3430ES2;

			cpu_clkflg |= CK_3430ES2;

		}

		}

	} else if (cpu_is_omap3517()) {

		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;

		cpu_clkflg |= CK_3517;

	} else if (cpu_is_omap3505()) {

		cpu_mask = RATE_IN_3XXX | RATE_IN_3430ES2PLUS;

		cpu_clkflg |= CK_3505;

	}

	}





	if (omap3_has_192mhz_clk())

	if (omap3_has_192mhz_clk())