Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel_a_3...

diff --cc arch/arm/mach-omap2/clock3xxx_data.c
index 800069310f41b92ebc7dee0858609414f35e4bae,f4a626f7c79e9670d65edf05e9d5813883b42da8,8fe7d709afa6fa44ded148c5b10abf5fc625a1af,f4a626f7c79e9670d65edf05e9d5813883b42da8..4e1a3b0e8cc83d5d505abf7d789273c4f1a970a0
--- 1/arch/arm/mach-omap2/clock3xxx_data.c
--- 2/arch/arm/mach-omap2/clock3xxx_data.c
--- 3/arch/arm/mach-omap2/clock3xxx_data.c
--- 4/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@@@@ -3513,9 -3513,21 -3514,21 -3513,21 +3514,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()) {
 - -            cpu_mask = RATE_IN_34XX;
 - -            cpu_clkflg = CK_3517;
 - -    } else if (cpu_is_omap3505()) {
 +++    if (cpu_is_omap3517()) {
                cpu_mask = RATE_IN_34XX;
  -             cpu_clkflg = CK_3505;
  -     } else 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;
 +++            cpu_clkflg = CK_AM35XX;
        } else if (cpu_is_omap3630()) {
                cpu_mask = (RATE_IN_34XX | RATE_IN_36XX);
                cpu_clkflg = CK_36XX;