From 0baee892d506c5c39fcb3c4fc1ecc09d972e2b7b Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 5 Nov 2010 09:37:22 +0100 Subject: [PATCH] --- yaml --- r: 226103 b: refs/heads/master c: c7259df3af03aee00985e9bb64fb2afa593f703f h: refs/heads/master i: 226101: 2da2d8eebcab42dee020ffb62116ee27defa02af 226099: 5be23296a501467d7e40c18478b0c421e68f7248 226095: cd73de627cbb8b91c91c6148b81657bc8372493e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 4 ++++ trunk/arch/arm/mach-mx3/Kconfig | 2 ++ trunk/arch/arm/plat-mxc/Kconfig | 3 +++ trunk/arch/arm/plat-mxc/Makefile | 5 +++-- trunk/arch/arm/plat-mxc/{irq.c => avic.c} | 0 6 files changed, 13 insertions(+), 3 deletions(-) rename trunk/arch/arm/plat-mxc/{irq.c => avic.c} (100%) diff --git a/[refs] b/[refs] index 12ea22fe2c9c..93066c1f6388 100644 --- 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 index 41b6450df810..8a9de1751b79 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -6,6 +6,7 @@ config SOC_IMX1 select CPU_ARM920T select IMX_HAVE_DMA_V1 select IMX_HAVE_IOMUX_V1 + select MXC_AVIC config SOC_IMX21 bool @@ -13,12 +14,14 @@ config SOC_IMX21 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 @@ -26,6 +29,7 @@ config SOC_IMX27 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 index a682c03a1f94..165e7221c500 100644 --- a/trunk/arch/arm/mach-mx3/Kconfig +++ b/trunk/arch/arm/mach-mx3/Kconfig @@ -15,6 +15,7 @@ config SOC_IMX31 select IMX_HAVE_PLATFORM_MXC_RNGA select ARCH_MXC_AUDMUX_V2 select ARCH_MX31 + select MXC_AVIC config SOC_IMX35 bool @@ -22,6 +23,7 @@ config SOC_IMX35 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 index a31fa161bb6d..6c66bc0521d8 100644 --- 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 index 372670952789..989cb59e67ac 100644 --- 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 b/trunk/arch/arm/plat-mxc/avic.c similarity index 100% rename from trunk/arch/arm/plat-mxc/irq.c rename to trunk/arch/arm/plat-mxc/avic.c