> -----Original Message----- > From: Hilman, Kevin > Sent: Thursday, January 05, 2012 6:47 AM > To: linux-omap@xxxxxxxxxxxxxxx > Cc: Paul Walmsley; Hiremath, Vaibhav > Subject: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices > the same > > The init for 3505/3517 specific clocks depends on the ordering of > cpu_is checks, is error prone and confusing (there are 2 separate > checks for cpu_is_omap3505()). > > Remove the 3505-specific checking since CK_3505 flag is not used, and > treat all AM35x clocks the same. > > This means that the SGX clock (the only AM35x clkdev not currently > flagged for 3505) will now be registered on 3505, but that is > harmless. That can be cleaned up when the clkdev nodes are removed in > favor of them being registered by hwmod. > [Hiremath, Vaibhav] How do you think we can use hwmod here? Currently hwmod is also dependent on cpu_is_xxxx to register respective modules. I completely understand and agree to the fact that there may not be any harm due to this, but this means, iva will be always registered for 3505 devices. Thanks, Vaibhav > Signed-off-by: Kevin Hilman <khilman@xxxxxx> > --- > arch/arm/mach-omap2/clock3xxx_data.c | 14 +------------- > 1 files changed, 1 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach- > omap2/clock3xxx_data.c > index e09e506..26fb4d9 100644 > --- a/arch/arm/mach-omap2/clock3xxx_data.c > +++ b/arch/arm/mach-omap2/clock3xxx_data.c > @@ -3505,21 +3505,9 @@ int __init omap3xxx_clk_init(void) > struct omap_clk *c; > u32 cpu_clkflg = 0; > > - /* > - * 3505 must be tested before 3517, since 3517 returns true > - * for both AM3517 chips and AM3517 family chips, which > - * includes 3505. Unfortunately there's no obvious family > - * test for 3517/3505 :-( > - */ > - if (cpu_is_omap3505()) { > - cpu_mask = RATE_IN_34XX; > - cpu_clkflg = CK_3505; > - } else if (cpu_is_omap3517()) { > + if (cpu_is_omap3517()) { > cpu_mask = RATE_IN_34XX; > cpu_clkflg = CK_3517; > - } else if (cpu_is_omap3505()) { > - cpu_mask = RATE_IN_34XX; > - cpu_clkflg = CK_3505; > } else if (cpu_is_omap3630()) { > cpu_mask = (RATE_IN_34XX | RATE_IN_36XX); > cpu_clkflg = CK_36XX; > -- > 1.7.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html