diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-05 09:37:22 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-24 10:08:58 +0100 |
| commit | c7259df3af03aee00985e9bb64fb2afa593f703f (patch) | |
| tree | 1cfa894081ad2704e4047ee64a9d534d0dfc2f84 | |
| parent | 7608d7d2b4a146f560436f5b99b1b93d30049e4e (diff) | |
| download | op-kernel-dev-c7259df3af03aee00985e9bb64fb2afa593f703f.zip op-kernel-dev-c7259df3af03aee00985e9bb64fb2afa593f703f.tar.gz | |
ARM i.MX irq: Compile avic irq code only on SoCs that need it
This patch adds a Kconfig option for the avic irq controller
and lets the SoCs that need it select this option.
Also, as we have two irq controllers for i.MX, irq.c is not
appropriate anymore, so rename it to avic.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/Makefile | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/avic.c (renamed from arch/arm/plat-mxc/irq.c) | 0 |
5 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 41b6450..8a9de17 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/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/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index a682c03..165e722 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/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/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index a31fa16..6c66bc0 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/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/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index 3726709..989cb59 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/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/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/avic.c index 7331f2a..7331f2a 100644 --- a/arch/arm/plat-mxc/irq.c +++ b/arch/arm/plat-mxc/avic.c |
