Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-drm-fsl-dcu.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 0d0c01c35dc3484561614561ae00da53ad3a87fe..1b8e97331ffbdba1e8a6c6307ab76d3bc2f73028 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -39,6 +39,7 @@ config ARM64
        select HARDIRQS_SW_RESEND
        select HAVE_ALIGNED_STRUCT_PAGE if SLUB
        select HAVE_ARCH_AUDITSYSCALL
+       select HAVE_ARCH_BITREVERSE
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_SECCOMP_FILTER
@@ -165,6 +166,11 @@ config ARCH_EXYNOS7
        help
          This enables support for Samsung Exynos7 SoC family
 
+config ARCH_FSL_LS2085A
+       bool "Freescale LS2085A SOC"
+       help
+         This enables support for Freescale LS2085A SOC.
+
 config ARCH_MEDIATEK
        bool "Mediatek MT65xx & MT81xx ARMv8 SoC"
        select ARM_GIC
@@ -185,7 +191,6 @@ config ARCH_TEGRA
        select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
-       select HAVE_SMP
        select PINCTRL
        select RESET_CONTROLLER
        help
@@ -195,7 +200,6 @@ config ARCH_TEGRA_132_SOC
        bool "NVIDIA Tegra132 SoC"
        depends on ARCH_TEGRA
        select PINCTRL_TEGRA124
-       select USB_ARCH_HAS_EHCI if USB_SUPPORT
        select USB_ULPI if USB_PHY
        select USB_ULPI_VIEWPORT if USB_PHY
        help
@@ -204,11 +208,6 @@ config ARCH_TEGRA_132_SOC
          but contains an NVIDIA Denver CPU complex in place of
          Tegra124's "4+1" Cortex-A15 CPU complex.
 
-config ARCH_FSL_LS2085A
-       bool "Freescale LS2085A SOC"
-       help
-         This enables support for Freescale LS2085A SOC.
-
 config ARCH_THUNDER
        bool "Cavium Inc. Thunder SoC Family"
        help
@@ -405,7 +404,6 @@ config ARM64_VA_BITS_42
 
 config ARM64_VA_BITS_48
        bool "48-bit"
-       depends on !ARM_SMMU
 
 endchoice
 
@@ -596,6 +594,21 @@ config CP15_BARRIER_EMULATION
 
          If unsure, say Y
 
+config SETEND_EMULATION
+       bool "Emulate SETEND instruction"
+       help
+         The SETEND instruction alters the data-endianness of the
+         AArch32 EL0, and is deprecated in ARMv8.
+
+         Say Y here to enable software emulation of the instruction
+         for AArch32 userspace code.
+
+         Note: All the cpus on the system must have mixed endian support at EL0
+         for this feature to be enabled. If a new CPU - which doesn't support mixed
+         endian - is hotplugged in after this feature has been enabled, there could
+         be unexpected results in the applications.
+
+         If unsure, say Y
 endif
 
 endmenu
@@ -683,9 +696,6 @@ source "kernel/power/Kconfig"
 config ARCH_SUSPEND_POSSIBLE
        def_bool y
 
-config ARM64_CPU_SUSPEND
-       def_bool PM_SLEEP
-
 endmenu
 
 menu "CPU Power Management"