From: Paul Walmsley <paul@pwsan.com>
Date: Tue, 8 May 2012 05:55:56 +0000 (-0600)
Subject: Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel_a_3... 
X-Git-Tag: upstream/snapshot3+hdmi~7366^2~2^2~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0135f6a04642c192bdf4b36e06937d3387e174ff;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel_a_3.5' and 'pwrdm_clkdm_cleanup_3.5' into prcm_devel_a_3.5
---

0135f6a04642c192bdf4b36e06937d3387e174ff
diff --cc arch/arm/mach-omap2/clock3xxx_data.c
index 8000693,f4a626f,8fe7d70,f4a626f..4e1a3b0
--- a/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;