These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-at91 / Kconfig

diff --git a/kernel/arch/arm/mach-at91/Kconfig b/kernel/arch/arm/mach-at91/Kconfig
index fd95f34..3f50130 100644 (file)
--- a/kernel/arch/arm/mach-at91/Kconfig
+++ b/kernel/arch/arm/mach-at91/Kconfig
@@ -4,10 +4,22 @@ menuconfig ARCH_AT91
        select ARCH_REQUIRE_GPIOLIB
        select COMMON_CLK_AT91
        select PINCTRL
        select ARCH_REQUIRE_GPIOLIB
        select COMMON_CLK_AT91
        select PINCTRL

-       select PINCTRL_AT91

        select SOC_BUS
 
 if ARCH_AT91
        select SOC_BUS
 
 if ARCH_AT91

+config SOC_SAMA5D2
+       bool "SAMA5D2 family" if ARCH_MULTI_V7
+       select SOC_SAMA5
+       select CACHE_L2X0
+       select HAVE_FB_ATMEL
+       select HAVE_AT91_UTMI
+       select HAVE_AT91_USB_CLK
+       select HAVE_AT91_H32MX
+       select HAVE_AT91_GENERATED_CLK
+       select PINCTRL_AT91PIO4
+       help
+         Select this if ou are using one of Atmel's SAMA5D2 family SoC.
+

 config SOC_SAMA5D3
        bool "SAMA5D3 family" if ARCH_MULTI_V7
        select SOC_SAMA5
 config SOC_SAMA5D3
        bool "SAMA5D3 family" if ARCH_MULTI_V7
        select SOC_SAMA5


@@ -15,6 +27,7 @@ config SOC_SAMA5D3
        select HAVE_AT91_UTMI
        select HAVE_AT91_SMD
        select HAVE_AT91_USB_CLK
        select HAVE_AT91_UTMI
        select HAVE_AT91_SMD
        select HAVE_AT91_USB_CLK

+       select PINCTRL_AT91

        help
          Select this if you are using one of Atmel's SAMA5D3 family SoC.
          This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
        help
          Select this if you are using one of Atmel's SAMA5D3 family SoC.
          This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.


@@ -28,6 +41,7 @@ config SOC_SAMA5D4
        select HAVE_AT91_SMD
        select HAVE_AT91_USB_CLK
        select HAVE_AT91_H32MX
        select HAVE_AT91_SMD
        select HAVE_AT91_USB_CLK
        select HAVE_AT91_H32MX

+       select PINCTRL_AT91

        help
          Select this if you are using one of Atmel's SAMA5D4 family SoC.
 
        help
          Select this if you are using one of Atmel's SAMA5D4 family SoC.
 


@@ -38,6 +52,7 @@ config SOC_AT91RM9200
        select CPU_ARM920T
        select HAVE_AT91_USB_CLK
        select MIGHT_HAVE_PCI
        select CPU_ARM920T
        select HAVE_AT91_USB_CLK
        select MIGHT_HAVE_PCI

+       select PINCTRL_AT91

        select SOC_SAM_V4_V5
        select SRAM if PM
        help
        select SOC_SAM_V4_V5
        select SRAM if PM
        help


@@ -53,6 +68,7 @@ config SOC_AT91SAM9
        select HAVE_AT91_UTMI
        select HAVE_FB_ATMEL
        select MEMORY
        select HAVE_AT91_UTMI
        select HAVE_FB_ATMEL
        select MEMORY

+       select PINCTRL_AT91

        select SOC_SAM_V4_V5
        select SRAM if PM
        help
        select SOC_SAM_V4_V5
        select SRAM if PM
        help


@@ -83,6 +99,7 @@ config HAVE_AT91_USB_CLK
 config COMMON_CLK_AT91
        bool
        select COMMON_CLK
 config COMMON_CLK_AT91
        bool
        select COMMON_CLK

+       select MFD_SYSCON

 
 config HAVE_AT91_SMD
        bool
 
 config HAVE_AT91_SMD
        bool


@@ -90,6 +107,9 @@ config HAVE_AT91_SMD
 config HAVE_AT91_H32MX
        bool
 
 config HAVE_AT91_H32MX
        bool
 

+config HAVE_AT91_GENERATED_CLK
+       bool
+

 config SOC_SAM_V4_V5
        bool
 
 config SOC_SAM_V4_V5
        bool