kernel: Update to 3.11.6.

[people/amarx/ipfire-3.x.git] / kernel / config-armv5tel-kirkwood

diff --git a/kernel/config-armv5tel-kirkwood b/kernel/config-armv5tel-kirkwood
index bb96a25aeff756d9d31fac45c0d5ad09a9b41790..6dbb2fa18ef4dee1ae8e2fbd2420a330d5d524dd 100644 (file)
--- a/kernel/config-armv5tel-kirkwood
+++ b/kernel/config-armv5tel-kirkwood
@@ -1,3 +1,4 @@
+CONFIG_ARCH_HAS_CPUFREQ=y
 
 #
 # IRQ subsystem
@@ -14,7 +15,6 @@ CONFIG_ARCH_KIRKWOOD=y
 # Marvell Kirkwood Implementations
 #
 CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_DB88F6281_BP=y
 CONFIG_MACH_DOCKSTAR=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
@@ -40,6 +40,7 @@ CONFIG_MACH_TS41X=y
 #
 CONFIG_ARCH_KIRKWOOD_DT=y
 CONFIG_MACH_CLOUDBOX_DT=y
+CONFIG_MACH_DB88F628X_BP_DT=y
 CONFIG_MACH_DLINK_KIRKWOOD_DT=y
 CONFIG_MACH_DOCKSTAR_DT=y
 CONFIG_MACH_DREAMPLUG_DT=y
@@ -56,11 +57,15 @@ CONFIG_MACH_NETSPACE_LITE_V2_DT=y
 CONFIG_MACH_NETSPACE_MAX_V2_DT=y
 CONFIG_MACH_NETSPACE_MINI_V2_DT=y
 CONFIG_MACH_NETSPACE_V2_DT=y
-CONFIG_MACH_NSA310_DT=y
 CONFIG_MACH_OPENBLOCKS_A6_DT=y
 CONFIG_MACH_READYNAS_DT=y
+CONFIG_MACH_SHEEVAPLUG_DT=y
 CONFIG_MACH_TOPKICK_DT=y
 CONFIG_MACH_TS219_DT=y
+
+#
+# ST-Ericsson U300/U335 Feature Selections
+#
 CONFIG_PLAT_ORION=y
 CONFIG_PLAT_ORION_LEGACY=y
 
@@ -80,6 +85,11 @@ CONFIG_OUTER_CACHE=y
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
+#
+# PCI host controller drivers
+#
+CONFIG_PCI_MVEBU=y
+
 #
 # Boot options
 #
@@ -87,6 +97,33 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
 
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# ARM CPU frequency scaling drivers
+#
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
+CONFIG_ARM_KIRKWOOD_CPUFREQ=y
+
 #
 # Power management options
 #
@@ -125,8 +162,6 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_SINGLE=m
-# CONFIG_PINCTRL_EXYNOS is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -152,6 +187,7 @@ CONFIG_POWER_RESET_QNAP=y
 #
 # Native drivers
 #
+CONFIG_CPU_THERMAL=y
 CONFIG_KIRKWOOD_THERMAL=m
 
 #
@@ -184,6 +220,7 @@ CONFIG_REGULATOR_LP8755=m
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_VEXPRESS=m
 
 #
 # Frame buffer hardware drivers
@@ -238,8 +275,13 @@ CONFIG_COMMON_CLK=y
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
 CONFIG_COMMON_CLK_SI5351=m
-CONFIG_MVEBU_CLK_CORE=y
-CONFIG_MVEBU_CLK_GATING=y
+CONFIG_MVEBU_CLK_COMMON=y
+CONFIG_KIRKWOOD_CLK=y
+
+#
+# Rpmsg drivers
+#
+CONFIG_MVEBU_DEVBUS=y
 
 #
 # Random Number Generation