Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7259df3 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 7608d7d2

arch/arm/mach-imx/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ config SOC_IMX1 
	select CPU_ARM920T

	select CPU_ARM920T

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC





config SOC_IMX21

config SOC_IMX21

	bool

	bool
@@ -13,12 +14,14 @@ config SOC_IMX21 
	select ARCH_MXC_AUDMUX_V1

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC





config SOC_IMX25

config SOC_IMX25

	bool

	bool

	select CPU_ARM926T

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_IOMUX_V3

	select MXC_AVIC





config SOC_IMX27

config SOC_IMX27

	bool

	bool
@@ -26,6 +29,7 @@ config SOC_IMX27 
	select ARCH_MXC_AUDMUX_V1

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC





if ARCH_MX1

if ARCH_MX1

arch/arm/mach-mx3/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ config SOC_IMX31 
	select IMX_HAVE_PLATFORM_MXC_RNGA

	select IMX_HAVE_PLATFORM_MXC_RNGA

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_AUDMUX_V2

	select ARCH_MX31

	select ARCH_MX31

	select MXC_AVIC





config SOC_IMX35

config SOC_IMX35

	bool

	bool
@@ -22,6 +23,7 @@ config SOC_IMX35 
	select ARCH_MXC_AUDMUX_V2

	select ARCH_MXC_AUDMUX_V2

	select HAVE_EPIT

	select HAVE_EPIT

	select ARCH_MX35

	select ARCH_MX35

	select MXC_AVIC





comment "MX3 platforms:"

comment "MX3 platforms:"

arch/arm/plat-mxc/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,9 @@ config MXC_TZIC 
	  containing this interrupt controller.

	  containing this interrupt controller.

	  Say N here only if you are really sure.

	  Say N here only if you are really sure.





config MXC_AVIC

	bool



config MXC_PWM

config MXC_PWM

	tristate "Enable PWM driver"

	tristate "Enable PWM driver"

	select HAVE_PWM

	select HAVE_PWM

arch/arm/plat-mxc/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -3,10 +3,11 @@ 
#

#





# Common support

# 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_TZIC) += tzic.o

obj-$(CONFIG_MXC_AVIC) += avic.o





obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o

obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o

obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o

obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o

arch/arm/plat-mxc/irq.c→arch/arm/plat-mxc/avic.c

+0 −0

File moved.

View file