Merge omap tree

* master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream: (26 commits)
  ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
  ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
  ARM: OMAP: Update dmtimers
  ARM: OMAP: Make clock variables static
  ARM: OMAP: Fix GPMC compilation when DEBUG is defined
  ARM: OMAP: Mux updates for external DMA and GPIO
  ARM: OMAP: Add OMAP_TAG_CAMERA_SENSOR
  ARM: OMAP: Add initial 24xx suspend support
  ARM: OMAP: Update cpufreq support for 24xx
  ARM: OMAP: Add GPMC support for OMAP2
  ARM: OMAP: Fix DMA channel irq handling for omap24xx
  ARM: OMAP: OMAP2 DMA burst support
  ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1
  ARM: OMAP: Port dmtimers to OMAP2 and implement PWM support
  ARM: OMAP: Correct two bugs in arch/arm/mach-omap2/clock.c
  ARM: OMAP: Register the 24xx McSPI device
  ARM: OMAP: Add bitbank SPI driver for Innovator 1510 touchscreen
  ARM: OMAP: Aic23 alsa platform driver code for board-innovator
  ARM: OMAP: Fix GPIO IRQ mask handling
  ARM: OMAP: DMA transfer parameter configuration fix
  ...

1 files changed, 23 insertions, 14 deletions

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 72eb4bf571ac..6789dd4029a1 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -660,26 +660,35 @@ static int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
 
                 /* Isolate control register */
                 div_sel = (SRC_RATE_SEL_MASK & clk->flags);
-                div_off = clk->src_offset;
+                div_off = clk->rate_offset;
 
                 validrate = omap2_clksel_round_rate(clk, rate, &new_div);
-                if(validrate != rate)
+                if (validrate != rate)
                         return(ret);
 
                 field_val = omap2_get_clksel(&div_sel, &field_mask, clk);
                 if (div_sel == 0)
                         return ret;
 
-                if(clk->flags & CM_SYSCLKOUT_SEL1){
-                        switch(new_div){
-                        case 16: field_val = 4; break;
-                        case 8:  field_val = 3; break;
-                        case 4:  field_val = 2; break;
-                        case 2:  field_val = 1; break;
-                        case 1:  field_val = 0; break;
+                if (clk->flags & CM_SYSCLKOUT_SEL1) {
+                        switch (new_div) {
+                        case 16:
+                                field_val = 4;
+                                break;
+                        case 8:
+                                field_val = 3;
+                                break;
+                        case 4:
+                                field_val = 2;
+                                break;
+                        case 2:
+                                field_val = 1;
+                                break;
+                        case 1:
+                                field_val = 0;
+                                break;
                         }
-                }
-                else
+                } else
                         field_val = new_div;
 
                 reg = (void __iomem *)div_sel;
@@ -744,7 +753,7 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,
                         val = 0x2;
                 break;
         case CM_WKUP_SEL1:
-                src_reg_addr = (u32)&CM_CLKSEL2_CORE;
+                src_reg_addr = (u32)&CM_CLKSEL_WKUP;
                 mask = 0x3;
                 if (src_clk == &func_32k_ck)
                         val = 0x0;
@@ -784,9 +793,9 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset,
                         val = 0;
                 if (src_clk == &sys_ck)
                         val = 1;
-                if (src_clk == &func_54m_ck)
-                        val = 2;
                 if (src_clk == &func_96m_ck)
+                        val = 2;
+                if (src_clk == &func_54m_ck)
                         val = 3;
                 break;
         }