Merge branch 'fix/hda' into for-linus

[~andy/linux] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 705bb71af245c8350eaa95c6a660afd535fe0028..fa6dc4dd3b193597aea23f0516014f5d1f5005db 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -32,6 +32,9 @@ config GENERIC_HWEIGHT
 config GENERIC_HARDIRQS
        def_bool y
 
+config GENERIC_GPIO
+       def_bool y
+
 config ARCH_HAS_ILOG2_U32
        def_bool n
 
@@ -45,6 +48,9 @@ config HZ
        int
        default 100
 
+config GENERIC_TIME
+       def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
@@ -69,6 +75,11 @@ config XTENSA_VARIANT_DC232B
        select MMU
        help
          This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
+
+config XTENSA_VARIANT_S6000
+       bool "s6000 - Stretch software configurable processor"
+       select VARIANT_IRQ_SWITCH
+       select ARCH_REQUIRE_GPIOLIB
 endchoice
 
 config XTENSA_UNALIGNED_USER
@@ -148,6 +159,10 @@ config XTENSA_PLATFORM_XT2000
          XT2000 is the name of Tensilica's feature-rich emulation platform.
          This hardware is capable of running a full Linux distribution.
 
+config XTENSA_PLATFORM_S6105
+       bool "S6105"
+       select SERIAL_CONSOLE
+
 endchoice