kernel: Update to 3.9.3.

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

diff --git a/kernel/config-armv5tel-kirkwood b/kernel/config-armv5tel-kirkwood
index b2d3244779b7bd052d9de2c281abba2e8936a4bb..eb407a1bccfe88a7ce086807cc5aec8ad097edd4 100644 (file)
--- a/kernel/config-armv5tel-kirkwood
+++ b/kernel/config-armv5tel-kirkwood
@@ -20,6 +20,26 @@ CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
+CONFIG_ARCH_KIRKWOOD_DT=y
+CONFIG_MACH_GURUPLUG_DT=y
+CONFIG_MACH_DREAMPLUG_DT=y
+CONFIG_MACH_ICONNECT_DT=y
+CONFIG_MACH_DLINK_KIRKWOOD_DT=y
+CONFIG_MACH_IB62X0_DT=y
+CONFIG_MACH_TS219_DT=y
+CONFIG_MACH_DOCKSTAR_DT=y
+CONFIG_MACH_GOFLEXNET_DT=y
+CONFIG_MACH_LSXL_DT=y
+CONFIG_MACH_IOMEGA_IX2_200_DT=y
+CONFIG_MACH_KM_KIRKWOOD_DT=y
+CONFIG_MACH_INETSPACE_V2_DT=y
+CONFIG_MACH_MPLCEC4_DT=y
+CONFIG_MACH_NETSPACE_V2_DT=y
+CONFIG_MACH_NETSPACE_MAX_V2_DT=y
+CONFIG_MACH_NETSPACE_LITE_V2_DT=y
+CONFIG_MACH_NETSPACE_MINI_V2_DT=y
+CONFIG_MACH_OPENBLOCKS_A6_DT=y
+CONFIG_MACH_TOPKICK_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@@ -34,11 +54,9 @@ CONFIG_MACH_D2NET_V2=y
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
 CONFIG_MACH_T5325=y
-
-#
-# System MMU
-#
+CONFIG_MACH_NSA310_DT=y
 CONFIG_PLAT_ORION=y
+CONFIG_PLAT_ORION_LEGACY=y
 
 #
 # Processor Type
@@ -56,11 +74,23 @@ CONFIG_OUTER_CACHE=y
 CONFIG_CACHE_FEROCEON_L2=y
 CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH=y
 
+#
+# Boot options
+#
+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
+
 #
 # Power management options
 #
 # CONFIG_ARM_CPU_SUSPEND is not set
 
+#
+# Bluetooth device drivers
+#
+CONFIG_RFKILL_REGULATOR=m
+
 #
 # Distributed Switch Architecture drivers
 #
@@ -72,8 +102,21 @@ CONFIG_MV643XX_ETH=m
 CONFIG_I2C_MV64XXX=m
 
 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_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
 CONFIG_GPIO_GENERIC=y
 
@@ -81,17 +124,74 @@ CONFIG_GPIO_GENERIC=y
 # Memory mapped GPIO drivers:
 #
 CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_MVEBU=y
 
 #
 # SPI GPIO expanders:
 #
 CONFIG_GPIO_MCP23S08=m
 
+#
+# 1-wire Slaves
+#
+# CONFIG_CHARGER_MANAGER is not set
+CONFIG_POWER_RESET_QNAP=y
+
+#
+# Native drivers
+#
+CONFIG_KIRKWOOD_THERMAL=m
+
 #
 # Watchdog Device Drivers
 #
 CONFIG_ORION_WATCHDOG=m
 
+#
+# Multifunction device drivers
+#
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+CONFIG_REGULATOR_LP8755=m
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+
+#
+# Graphics support
+#
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_TILCDC is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_BACKLIGHT_PWM is not set
+
 #
 # Console display driver support
 #
@@ -110,6 +210,7 @@ CONFIG_MMC_MVSDIO=m
 #
 # LED drivers
 #
+CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
 
@@ -124,6 +225,18 @@ CONFIG_RTC_DRV_MV=m
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_MV_XOR=y
 
+#
+# Android
+#
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_DEBUG is not set
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_GATING=y
+
 #
 # Random Number Generation
 #