---

yaml --- r: 59233 b: refs/heads/master c: b3e6a50 h: refs/heads/master i: 59231: 6590979 v: v3
git-mirror · Jul 12, 2007 · d4094d6 · d4094d6
1 parent f6da3f1
commit d4094d6
Show file tree

Hide file tree

Showing 17 changed files with 255 additions and 1,023 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83f53220f8313f097cdf181928be13bafbb697ea
+refs/heads/master: b3e6a508ed920698d367e5993ed056d70364d91f
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -241,6 +241,7 @@ config ARCH_H720X
 
 config ARCH_IMX
 	bool "IMX"
+	select GENERIC_GPIO
 	help
 	  Support for Motorola's i.MX family of processors (MX1, MXL).
 
@@ -384,7 +385,6 @@ config ARCH_DAVINCI
 	bool "TI DaVinci"
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
-	select GENERIC_GPIO
 	help
 	  Support for TI's DaVinci platform.
 

diff --git a/trunk/arch/arm/mach-davinci/Makefile b/trunk/arch/arm/mach-davinci/Makefile
@@ -4,8 +4,7 @@
 #
 
 # Common objects
-obj-y 			:= time.o irq.o clock.o serial.o io.o id.o psc.o \
-			   gpio.o mux.o
+obj-y 			:= time.o irq.o serial.o io.o id.o psc.o
 
 # Board specific
 obj-$(CONFIG_MACH_DAVINCI_EVM)  += board-evm.o
diff --git a/trunk/arch/arm/mach-davinci/board-evm.c b/trunk/arch/arm/mach-davinci/board-evm.c
@@ -32,7 +32,6 @@
 void __init davinci_psc_init(void);
 void __init davinci_irq_init(void);
 void __init davinci_map_common_io(void);
-void __init davinci_init_common_hw(void);
 
 /* NOR Flash base address set to CS0 by default */
 #define NOR_FLASH_PHYS 0x02000000
@@ -117,7 +116,6 @@ static __init void davinci_evm_init(void)
 
 static __init void davinci_evm_irq_init(void)
 {
-	davinci_init_common_hw();
 	davinci_irq_init();
 }
 

diff --git a/trunk/arch/arm/mach-davinci/clock.c b/trunk/arch/arm/mach-davinci/clock.c