evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: at91: introduce OLD_IRQ_AT91 Kconfig option

Browse source 
Introduce the OLD_IRQ_AT91 Kconfig option to prepare migration to the
new AIC driver.

Select this option for all at91 SoCs and all available boards so that we
can later move DT enabled boards to the new irq driver and keep the old
implementation when legacy boards are selected.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Boris BREZILLON 2014-07-10 19:14:19 +02:00 • committed by Nicolas Ferre
parent 7d1311b93e
commit 91a55d4f69
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/arm/mach-at91/Kconfig
View file

@ -28,6 +28,11 @@ config OLD_CLK_AT91
bool bool
default AT91_PMC_UNIT && AT91_USE_OLD_CLK default AT91_PMC_UNIT && AT91_USE_OLD_CLK
config OLD_IRQ_AT91
bool
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
config AT91_SAM9_ALT_RESET config AT91_SAM9_ALT_RESET
bool bool
default !ARCH_AT91X40 default !ARCH_AT91X40
@ -47,16 +52,12 @@ config SOC_AT91SAM9
select AT91_SAM9_TIME select AT91_SAM9_TIME
select CPU_ARM926T select CPU_ARM926T
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
config SOC_SAMA5 config SOC_SAMA5
bool bool
select AT91_SAM9_TIME select AT91_SAM9_TIME
select CPU_V7 select CPU_V7
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select USE_OF select USE_OF
menu "Atmel AT91 System-on-Chip" menu "Atmel AT91 System-on-Chip"
@ -70,8 +71,7 @@ config ARCH_AT91X40
depends on !MMU depends on !MMU
select CPU_ARM7TDMI select CPU_ARM7TDMI
select ARCH_USES_GETTIMEOFFSET select ARCH_USES_GETTIMEOFFSET
select MULTI_IRQ_HANDLER select OLD_IRQ_AT91
select SPARSE_IRQ
help help
Select this if you are using one of Atmel's AT91X40 SoC. Select this if you are using one of Atmel's AT91X40 SoC.
@ -111,8 +111,6 @@ config SOC_AT91RM9200
select CPU_ARM920T select CPU_ARM920T
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select HAVE_AT91_USB_CLK select HAVE_AT91_USB_CLK
config SOC_AT91SAM9260 config SOC_AT91SAM9260
@ -195,6 +193,7 @@ comment "Generic Board Type"
config MACH_AT91RM9200_DT config MACH_AT91RM9200_DT
bool "Atmel AT91RM9200 Evaluation Kits with device-tree support" bool "Atmel AT91RM9200 Evaluation Kits with device-tree support"
depends on SOC_AT91RM9200 depends on SOC_AT91RM9200
select OLD_IRQ_AT91
select USE_OF select USE_OF
help help
Select this if you want to experiment device-tree with Select this if you want to experiment device-tree with
@ -203,6 +202,7 @@ config MACH_AT91RM9200_DT
config MACH_AT91SAM9_DT config MACH_AT91SAM9_DT
bool "Atmel AT91SAM Evaluation Kits with device-tree support" bool "Atmel AT91SAM Evaluation Kits with device-tree support"
depends on SOC_AT91SAM9 depends on SOC_AT91SAM9
select OLD_IRQ_AT91
select USE_OF select USE_OF
help help
Select this if you want to experiment device-tree with Select this if you want to experiment device-tree with
@ -211,6 +211,7 @@ config MACH_AT91SAM9_DT
config MACH_SAMA5_DT config MACH_SAMA5_DT
bool "Atmel SAMA5 Evaluation Kits with device-tree support" bool "Atmel SAMA5 Evaluation Kits with device-tree support"
depends on SOC_SAMA5 depends on SOC_SAMA5
select OLD_IRQ_AT91
select USE_OF select USE_OF
select PHYLIB if NETDEVICES select PHYLIB if NETDEVICES
help help

6
arch/arm/mach-at91/Kconfig.non_dt
View file

@ -14,31 +14,37 @@ config ARCH_AT91RM9200
bool "AT91RM9200" bool "AT91RM9200"
select SOC_AT91RM9200 select SOC_AT91RM9200
select AT91_USE_OLD_CLK select AT91_USE_OLD_CLK
select OLD_IRQ_AT91
config ARCH_AT91SAM9260 config ARCH_AT91SAM9260
bool "AT91SAM9260 or AT91SAM9XE or AT91SAM9G20" bool "AT91SAM9260 or AT91SAM9XE or AT91SAM9G20"
select SOC_AT91SAM9260 select SOC_AT91SAM9260
select AT91_USE_OLD_CLK select AT91_USE_OLD_CLK
select OLD_IRQ_AT91
config ARCH_AT91SAM9261 config ARCH_AT91SAM9261
bool "AT91SAM9261 or AT91SAM9G10" bool "AT91SAM9261 or AT91SAM9G10"
select SOC_AT91SAM9261 select SOC_AT91SAM9261
select AT91_USE_OLD_CLK select AT91_USE_OLD_CLK
select OLD_IRQ_AT91
config ARCH_AT91SAM9263 config ARCH_AT91SAM9263
bool "AT91SAM9263" bool "AT91SAM9263"
select SOC_AT91SAM9263 select SOC_AT91SAM9263
select AT91_USE_OLD_CLK select AT91_USE_OLD_CLK
select OLD_IRQ_AT91
config ARCH_AT91SAM9RL config ARCH_AT91SAM9RL
bool "AT91SAM9RL" bool "AT91SAM9RL"
select SOC_AT91SAM9RL select SOC_AT91SAM9RL
select AT91_USE_OLD_CLK select AT91_USE_OLD_CLK
select OLD_IRQ_AT91
config ARCH_AT91SAM9G45 config ARCH_AT91SAM9G45
bool "AT91SAM9G45" bool "AT91SAM9G45"
select SOC_AT91SAM9G45 select SOC_AT91SAM9G45
select AT91_USE_OLD_CLK select AT91_USE_OLD_CLK
select OLD_IRQ_AT91
endchoice endchoice

3
arch/arm/mach-at91/Makefile
View file

@ -2,11 +2,12 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
obj-y := irq.o gpio.o setup.o sysirq_mask.o obj-y := gpio.o setup.o sysirq_mask.o
obj-m := obj-m :=
obj-n := obj-n :=
obj- := obj- :=
obj-$(CONFIG_OLD_IRQ_AT91) += irq.o
obj-$(CONFIG_OLD_CLK_AT91) += clock.o obj-$(CONFIG_OLD_CLK_AT91) += clock.o
obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o