From: Tony Lindgren <tony@atomide.com>
Date: Fri, 10 Apr 2009 19:03:31 +0000 (-0700)
Subject: Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=12323321f004c9e83061c9a9d06046b050d6d4c7

Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

Conflicts:
	arch/arm/mach-omap2/board-omap3beagle.c
---

12323321f004c9e83061c9a9d06046b050d6d4c7
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
index 346351e0fe8,3a7a29d1f9a..19bc2a1f7fb
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@@ -43,11 -41,11 +43,12 @@@
  #include <mach/gpmc.h>
  #include <mach/nand.h>
  #include <mach/mux.h>
 -#include <mach/usb.h>
+ #include <mach/timer-gp.h>
  
 +#include "twl4030-generic-scripts.h"
  #include "mmc-twl4030.h"
  
 +
  #define GPMC_CS0_BASE  0x60
  #define GPMC_CS_SIZE   0x30
  
@@@ -307,8 -185,11 +308,11 @@@ static int __init omap3_beagle_i2c_init
  
  static void __init omap3_beagle_init_irq(void)
  {
 -	omap2_init_common_hw(NULL);
 +	omap2_init_common_hw(mt46h32m32lf6_sdrc_params);
  	omap_init_irq();
+ #ifdef CONFIG_OMAP_32K_TIMER
+ 	omap2_gp_clockevent_set_gptimer(12);
+ #endif
  	omap_gpio_init();
  }