From: paulius.zaleckas@gmail•com (Paulius Zaleckas)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/7] ARM i.MX irq: Compile avic irq code only on SoCs that need it
Date: Fri, 05 Nov 2010 16:05:16 +0200 [thread overview]
Message-ID: <4CD40F1C.3020005@gmail.com> (raw)
In-Reply-To: <1288950371-1552-3-git-send-email-s.hauer@pengutronix.de>
On 11/05/2010 11:46 AM, Sascha Hauer wrote:
> 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>
> ---
> arch/arm/mach-imx/Kconfig | 3 +++
> arch/arm/mach-mx3/Kconfig | 2 ++
> arch/arm/plat-mxc/Kconfig | 4 ++++
> arch/arm/plat-mxc/Makefile | 3 ++-
> arch/arm/plat-mxc/{irq.c => avic.c} | 0
> 5 files changed, 11 insertions(+), 1 deletions(-)
> rename arch/arm/plat-mxc/{irq.c => avic.c} (100%)
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 197f9e2..58b6114 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -7,6 +7,7 @@ config SOC_IMX1
> select CPU_ARM920T
> select IMX_HAVE_DMA_V1
> select IMX_HAVE_IOMUX_V1
> + select MXC_AVIC
> bool
>
> comment "MX1 platforms:"
> @@ -36,6 +37,7 @@ config SOC_IMX21
> select ARCH_MXC_AUDMUX_V1
> select IMX_HAVE_DMA_V1
> select IMX_HAVE_IOMUX_V1
> + select MXC_AVIC
> bool
>
> config SOC_IMX27
> @@ -43,6 +45,7 @@ config SOC_IMX27
> select ARCH_MXC_AUDMUX_V1
> select IMX_HAVE_DMA_V1
> select IMX_HAVE_IOMUX_V1
> + select MXC_AVIC
> bool
>
> choice
> diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
> index 5000ac1..7863199 100644
> --- a/arch/arm/mach-mx3/Kconfig
> +++ b/arch/arm/mach-mx3/Kconfig
> @@ -3,6 +3,7 @@ if ARCH_MX3
> config ARCH_MX31
> select ARCH_HAS_RNGA
> select ARCH_MXC_AUDMUX_V2
> + select MXC_AVIC
> bool
>
> config ARCH_MX35
> @@ -10,6 +11,7 @@ config ARCH_MX35
> select ARCH_MXC_IOMUX_V3
> select ARCH_MXC_AUDMUX_V2
> select HAVE_EPIT
> + select MXC_AVIC
>
> comment "MX3 platforms:"
>
> diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
> index 64e3a64..31d07c0 100644
> --- a/arch/arm/plat-mxc/Kconfig
> +++ b/arch/arm/plat-mxc/Kconfig
> @@ -25,6 +25,7 @@ config ARCH_MX25
> select ARCH_MXC_IOMUX_V3
> select HAVE_FB_IMX
> select ARCH_MXC_AUDMUX_V2
> + select MXC_AVIC
> help
> This enables support for systems based on the Freescale i.MX25 family
>
> @@ -75,6 +76,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..0e12591 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)
it is not irq.o anymore as stated in the comment
> 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
> similarity index 100%
> rename from arch/arm/plat-mxc/irq.c
> rename to arch/arm/plat-mxc/avic.c
next prev parent reply other threads:[~2010-11-05 14:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-05 9:46 i.MX patches for next Sascha Hauer
2010-11-05 9:46 ` [PATCH 1/7] ARM i.MX51 boards: Do not use PHYS_OFFSET Sascha Hauer
2010-11-05 10:30 ` Uwe Kleine-König
2010-11-05 9:46 ` [PATCH 2/7] ARM i.MX irq: Compile avic irq code only on SoCs that need it Sascha Hauer
2010-11-05 14:05 ` Paulius Zaleckas [this message]
2010-11-05 9:46 ` [PATCH 3/7] ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option Sascha Hauer
2010-11-05 9:46 ` [PATCH 4/7] ARM i.MX irq: Allow runtime decision between AVIC and TZIC Sascha Hauer
2010-11-05 10:37 ` Uwe Kleine-König
2010-11-05 12:04 ` Sascha Hauer
2010-11-05 11:49 ` Uwe Kleine-König
2010-11-05 9:46 ` [PATCH 5/7] ARM i.MX DMA: return gracefully on different socs Sascha Hauer
2010-11-05 9:46 ` [PATCH 6/7] ARM i.MX51: " Sascha Hauer
2010-11-05 9:46 ` [PATCH 7/7] ARM i.MX27 pm: " Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CD40F1C.3020005@gmail.com \
--to=paulius.zaleckas@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox