[ARM] 3426/1: ARM: OMAP: 1/8 Update clock framework

Patch from Tony Lindgren

Update OMAP clock framework from linux-omap tree.
The highlights of the patch are:

- Add support for omap730 clocks by Andrzej Zaborowski
- Fix compile warnings by Dirk Behme
- Add support for using dev id by Tony Lindgren and Komal Shah
- Move memory timings and PRCM into separate files by Tony Lindgren

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 7 insertions, 2 deletions

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 75110ba10424..619db18144ea 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -345,7 +345,7 @@ static unsigned calc_ext_dsor(unsigned long rate)
          */
         for (dsor = 2; dsor < 96; ++dsor) {
                 if ((dsor & 1) && dsor > 8)
-                        continue;
+                        continue;
                 if (rate >= 96000000 / dsor)
                         break;
         }
@@ -687,6 +687,11 @@ int __init omap1_clk_init(void)
                         clk_register(*clkp);
                         continue;
                 }
+
+                if (((*clkp)->flags &CLOCK_IN_OMAP310) && cpu_is_omap310()) {
+                        clk_register(*clkp);
+                        continue;
+                }
         }
 
         info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
@@ -784,7 +789,7 @@ int __init omap1_clk_init(void)
         clk_enable(&armxor_ck.clk);
         clk_enable(&armtim_ck.clk); /* This should be done by timer code */
 
-        if (cpu_is_omap1510())
+        if (cpu_is_omap15xx())
                 clk_enable(&arm_gpio_ck);
 
         return 0;