kernel: Update to 3.16.2

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

diff --git a/kernel/config-armv5tel-default b/kernel/config-armv5tel-default
index ce625d1a67cfc23b6afdb75879045ddce7889b25..8cdb7364e1281d58ff83494bd6283407111a4d18 100644 (file)
--- a/kernel/config-armv5tel-default
+++ b/kernel/config-armv5tel-default
@@ -21,7 +21,6 @@ CONFIG_TINY_RCU=y
 #
 # CONFIG_ARCH_MULTIPLATFORM is not set
 CONFIG_ARCH_KIRKWOOD=y
-CONFIG_MACH_T5325=y
 
 #
 # Marvell Kirkwood Implementations
@@ -36,6 +35,7 @@ CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y
 CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
+CONFIG_MACH_T5325=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 
@@ -43,6 +43,7 @@ CONFIG_MACH_TS41X=y
 # Device tree entries
 #
 CONFIG_ARCH_KIRKWOOD_DT=y
+CONFIG_PLAT_ORION=y
 CONFIG_PLAT_ORION_LEGACY=y
 
 #
@@ -62,19 +63,29 @@ CONFIG_CPU_USE_DOMAINS=y
 # Processor Features
 #
 CONFIG_NEED_KUSER_HELPERS=y
+CONFIG_CACHE_FEROCEON_L2=y
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5
 
 #
 # PCI host controller drivers
 #
+# CONFIG_PCI_MVEBU is not set
 # CONFIG_PCIEPORTBUS is not set
 
 #
 # Kernel Features
 #
 CONFIG_ARCH_NR_GPIO=0
-# CONFIG_OABI_COMPAT is not set
+CONFIG_HZ_FIXED=0
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -89,6 +100,11 @@ CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
 # CONFIG_XIP_KERNEL is not set
 
+#
+# ARM CPU frequency scaling drivers
+#
+CONFIG_ARM_KIRKWOOD_CPUFREQ=y
+
 #
 # ARM CPU Idle Drivers
 #
@@ -100,6 +116,11 @@ CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
 #
 # CONFIG_SYS_HYPERVISOR is not set
 
+#
+# Bus devices
+#
+CONFIG_MVEBU_MBUS=y
+
 #
 # Device Tree and Open Firmware support
 #
@@ -114,6 +135,8 @@ CONFIG_VIRTIO_BLK=y
 # Distributed Switch Architecture drivers
 #
 # CONFIG_VORTEX is not set
+CONFIG_MV643XX_ETH=m
+CONFIG_MVNETA=m
 
 #
 # USB Network Adapters
@@ -125,6 +148,16 @@ CONFIG_B43_SDIO=y
 #
 # CONFIG_ISDN_DRV_LOOP is not set
 
+#
+# Input device support
+#
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Input Device Drivers
+#
+CONFIG_KEYBOARD_SAMSUNG=m
+
 #
 # PPS support
 #
@@ -138,19 +171,32 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Pin controllers
 #
+CONFIG_PINCTRL_APQ8064=m
 # CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
 
+#
+# Memory mapped GPIO drivers:
+#
+CONFIG_GPIO_MVEBU=y
+
 #
 # 1-wire Slaves
 #
 # CONFIG_CHARGER_LP8788 is not set
+# CONFIG_POWER_RESET_QNAP is not set
 
 #
 # Native drivers
 #
 CONFIG_KIRKWOOD_THERMAL=m
 
+#
+# Watchdog Device Drivers
+#
+CONFIG_ORION_WATCHDOG=m
+
 #
 # Sonics Silicon Backplane
 #
@@ -191,6 +237,9 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 #
 # Frame buffer Devices
 #
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_SYS_FOPS=m
 
 #
@@ -206,15 +255,21 @@ CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3_INPUT=y
 
 #
-# HD-Audio
+# Common SoC Audio options for Freescale CPUs:
 #
+CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
 CONFIG_SND_KIRKWOOD_SOC_T5325=m
 
 #
 # CODEC drivers
 #
-CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_CS42L51=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD_ORION=y
 
 #
 # USB Physical Layer drivers
@@ -231,6 +286,7 @@ CONFIG_MMC_BLOCK=m
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_MVSDIO=m
 
 #
 # LED drivers
@@ -239,6 +295,11 @@ CONFIG_LEDS_PWM=m
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
 
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MV=m
+
 #
 # DMA Devices
 #
@@ -272,8 +333,19 @@ CONFIG_BPCTL=m
 #
 CONFIG_COMMON_CLK_WM831X=m
 CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_KIRKWOOD_CLK=y
 
+#
+# Hardware Spinlock drivers
+#
+CONFIG_ORION_TIMER=y
+
+#
+# Rpmsg drivers
+#
+CONFIG_MVEBU_DEVBUS=y
+
 #
 # Analog to digital converters
 #
@@ -288,21 +360,16 @@ CONFIG_PWM_LP3943=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
+CONFIG_ORION_IRQCHIP=y
 
 #
-# Compile-time checks and compiler options
-#
-CONFIG_FRAME_POINTER=y
-
-#
-# RCU Debugging
+# PHY Subsystem
 #
-CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_PHY_MVEBU_SATA=y
 
 #
 # Runtime Testing
 #
-CONFIG_OLD_MCOUNT=y
 CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
 CONFIG_DEBUG_UART_8250=y
 CONFIG_DEBUG_UART_PHYS=0xf1012000
@@ -315,6 +382,7 @@ CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 #
 # Random Number Generation
 #
+CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y