---

yaml --- r: 226103 b: refs/heads/master c: c7259df h: refs/heads/master i: 226101: 2da2d8e 226099: 5be2329 226095: cd73de6 v: v3
git-mirror · Nov 24, 2010 · 0baee89 · 0baee89
1 parent 03e6c6d
commit 0baee89
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7608d7d2b4a146f560436f5b99b1b93d30049e4e
+refs/heads/master: c7259df3af03aee00985e9bb64fb2afa593f703f
diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig
@@ -6,26 +6,30 @@ config SOC_IMX1
 	select CPU_ARM920T
 	select IMX_HAVE_DMA_V1
 	select IMX_HAVE_IOMUX_V1
+	select MXC_AVIC
 
 config SOC_IMX21
 	bool
 	select CPU_ARM926T
 	select ARCH_MXC_AUDMUX_V1
 	select IMX_HAVE_DMA_V1
 	select IMX_HAVE_IOMUX_V1
+	select MXC_AVIC
 
 config SOC_IMX25
 	bool
 	select CPU_ARM926T
 	select ARCH_MXC_AUDMUX_V2
 	select ARCH_MXC_IOMUX_V3
+	select MXC_AVIC
 
 config SOC_IMX27
 	bool
 	select CPU_ARM926T
 	select ARCH_MXC_AUDMUX_V1
 	select IMX_HAVE_DMA_V1
 	select IMX_HAVE_IOMUX_V1
+	select MXC_AVIC
 
 if ARCH_MX1
 

diff --git a/trunk/arch/arm/mach-mx3/Kconfig b/trunk/arch/arm/mach-mx3/Kconfig
@@ -15,13 +15,15 @@ config SOC_IMX31
 	select IMX_HAVE_PLATFORM_MXC_RNGA
 	select ARCH_MXC_AUDMUX_V2
 	select ARCH_MX31
+	select MXC_AVIC
 
 config SOC_IMX35
 	bool
 	select ARCH_MXC_IOMUX_V3
 	select ARCH_MXC_AUDMUX_V2
 	select HAVE_EPIT
 	select ARCH_MX35
+	select MXC_AVIC
 
 comment "MX3 platforms:"
 

diff --git a/trunk/arch/arm/plat-mxc/Kconfig b/trunk/arch/arm/plat-mxc/Kconfig
@@ -70,6 +70,9 @@ config MXC_TZIC
 	  containing this interrupt controller.
 	  Say N here only if you are really sure.
 
+config MXC_AVIC
+	bool
+
 config MXC_PWM
 	tristate "Enable PWM driver"
 	select HAVE_PWM

diff --git a/trunk/arch/arm/plat-mxc/Makefile b/trunk/arch/arm/plat-mxc/Makefile
@@ -3,10 +3,11 @@
 #
 
 # Common support
-obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o
+obj-y := clock.o gpio.o time.o devices.o cpu.o system.o
 
-# MX51 uses the TZIC interrupt controller, older platforms use AVIC (irq.o)
+# MX51 uses the TZIC interrupt controller, older platforms use AVIC
 obj-$(CONFIG_MXC_TZIC) += tzic.o
+obj-$(CONFIG_MXC_AVIC) += avic.o
 
 obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
 obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o

diff --git a/trunk/arch/arm/plat-mxc/irq.c → trunk/arch/arm/plat-mxc/avic.c b/trunk/arch/arm/plat-mxc/irq.c → trunk/arch/arm/plat-mxc/avic.c