---

yaml --- r: 144504 b: refs/heads/master c: c5b736d h: refs/heads/master v: v3
git-mirror · Apr 23, 2009 · 3623ac8 · 3623ac8
1 parent e7f39a8
commit 3623ac8
Show file tree

Hide file tree

Showing 11 changed files with 403 additions and 235 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e653034e66ec406f37427f588115badc6fc6af64
+refs/heads/master: c5b736d093217890245a33e9a98fe92d6f3529bf
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -586,6 +586,7 @@ config ARCH_DAVINCI
 	select HAVE_CLK
 	select ZONE_DMA
 	select HAVE_IDE
+	select COMMON_CLKDEV
 	help
 	  Support for TI's DaVinci platform.
 

diff --git a/trunk/arch/arm/mach-davinci/Kconfig b/trunk/arch/arm/mach-davinci/Kconfig
@@ -18,6 +18,18 @@ config MACH_DAVINCI_EVM
 	  Configure this option to specify the whether the board used
 	  for development is a DaVinci EVM
 
+config DAVINCI_RESET_CLOCKS
+	bool "Reset unused clocks during boot"
+	depends on ARCH_DAVINCI
+	help
+	  Say Y if you want to reset unused clocks during boot.
+	  This option saves power, but assumes all drivers are
+	  using the clock framework. Broken drivers that do not
+	  yet use clock framework may not work with this option.
+	  If you are booting from another operating system, you
+	  probably do not want this option enabled until your
+	  device drivers work properly.
+
 endmenu
 
 endif
diff --git a/trunk/arch/arm/mach-davinci/board-evm.c b/trunk/arch/arm/mach-davinci/board-evm.c
@@ -406,8 +406,6 @@ davinci_evm_map_io(void)
 
 static __init void davinci_evm_init(void)
 {
-	davinci_psc_init();
-
 #if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
     defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
 #if defined(CONFIG_MTD_PHYSMAP) || \