Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-imx / Kconfig
index 33567aa..54fc3c5 100644 (file)
@@ -2,18 +2,11 @@ config ARCH_MXC
        bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
-       select ARM_PATCH_PHYS_VIRT
        select CLKSRC_MMIO
-       select COMMON_CLK
        select GENERIC_ALLOCATOR
-       select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
-       select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7
-       select MULTI_IRQ_HANDLER
        select PINCTRL
        select SOC_BUS
-       select SPARSE_IRQ
-       select USE_OF
        help
          Support for Freescale MXC/iMX-based family of processors
 
@@ -103,7 +96,6 @@ config SOC_IMX25
 
 config SOC_IMX27
        bool
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select CPU_ARM926T
        select IMX_HAVE_IOMUX_V1
@@ -129,10 +121,8 @@ config SOC_IMX35
 
 config SOC_IMX5
        bool
-       select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARCH_MXC_IOMUX_V3
-       select CPU_V7
        select MXC_TZIC
 
 config SOC_IMX51
@@ -792,16 +782,13 @@ config SOC_IMX6Q
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
        select ARM_GIC
-       select CPU_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_IMX_ANATOP
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC
        select HAVE_IMX_SRC
-       select HAVE_SMP
        select MFD_SYSCON
-       select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
        select PINCTRL_IMX6Q
        select PL310_ERRATA_588369 if CACHE_PL310
@@ -817,7 +804,6 @@ config SOC_IMX6SL
        select ARM_ERRATA_754322
        select ARM_ERRATA_775420
        select ARM_GIC
-       select CPU_V7
        select HAVE_IMX_ANATOP
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC
@@ -833,9 +819,7 @@ config SOC_IMX6SL
 
 config SOC_VF610
        bool "Vybrid Family VF610 support"
-       select CPU_V7
        select ARM_GIC
-       select CLKSRC_OF
        select PINCTRL_VF610
        select VF_PIT_TIMER
        select PL310_ERRATA_588369 if CACHE_PL310