Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / mach-at91 / Kconfig

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 6cc6f7aebdaea65004409a84fa1a7913a67c1bbb..0e6d548b70d9720d78c55c8a3341402486bc6dc9 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -12,6 +12,9 @@ config HAVE_AT91_DBGU0
 config HAVE_AT91_DBGU1
        bool
 
+config HAVE_AT91_DBGU2
+       bool
+
 config AT91_USE_OLD_CLK
        bool
 
@@ -28,36 +31,33 @@ config OLD_CLK_AT91
        bool
        default AT91_PMC_UNIT && AT91_USE_OLD_CLK
 
-config AT91_SAM9_ALT_RESET
+config OLD_IRQ_AT91
        bool
-       default !ARCH_AT91X40
-
-config AT91_SAM9G45_RESET
-       bool
-       default !ARCH_AT91X40
+       select MULTI_IRQ_HANDLER
+       select SPARSE_IRQ
 
-config AT91_SAM9_TIME
+config HAVE_AT91_SMD
        bool
 
-config HAVE_AT91_SMD
+config HAVE_AT91_H32MX
        bool
 
 config SOC_AT91SAM9
        bool
-       select AT91_SAM9_TIME
+       select ATMEL_AIC_IRQ if !OLD_IRQ_AT91
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
+       select MEMORY if USE_OF
+       select ATMEL_SDRAMC if USE_OF
 
 config SOC_SAMA5
        bool
-       select AT91_SAM9_TIME
+       select ATMEL_AIC5_IRQ
        select CPU_V7
        select GENERIC_CLOCKEVENTS
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
        select USE_OF
+       select MEMORY
+       select ATMEL_SDRAMC
 
 menu "Atmel AT91 System-on-Chip"
 
@@ -70,8 +70,7 @@ config ARCH_AT91X40
        depends on !MMU
        select CPU_ARM7TDMI
        select ARCH_USES_GETTIMEOFFSET
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
+       select OLD_IRQ_AT91
 
        help
          Select this if you are using one of Atmel's AT91X40 SoC.
@@ -103,16 +102,30 @@ config SOC_SAMA5D3
        help
          Select this if you are using one of Atmel's SAMA5D3 family SoC.
          This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
+
+config SOC_SAMA5D4
+       bool "SAMA5D4 family"
+       select SOC_SAMA5
+       select HAVE_AT91_DBGU2
+       select CLKSRC_MMIO
+       select CACHE_L2X0
+       select CACHE_PL310
+       select HAVE_FB_ATMEL
+       select HAVE_AT91_UTMI
+       select HAVE_AT91_SMD
+       select HAVE_AT91_USB_CLK
+       select HAVE_AT91_H32MX
+       help
+         Select this if you are using one of Atmel's SAMA5D4 family SoC.
 endif
 
 if SOC_SAM_V4_V5
 config SOC_AT91RM9200
        bool "AT91RM9200"
+       select ATMEL_AIC_IRQ if !OLD_IRQ_AT91
        select CPU_ARM920T
        select GENERIC_CLOCKEVENTS
        select HAVE_AT91_DBGU0
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
        select HAVE_AT91_USB_CLK
 
 config SOC_AT91SAM9260