kernel: Update to 3.6.6.

[people/ms/ipfire-3.x.git] / kernel / config-armv7hl-omap

diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 9b73127a1dd4b13a4d448457ed50635ec255ff4b..39487925fc0c98d9f5e549cd67e123952712dbaa 100644 (file)
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -35,15 +35,14 @@ CONFIG_ARCH_OMAP=y
 #
 # TI OMAP Common Features
 #
-CONFIG_ARCH_OMAP_OTG=y
 # CONFIG_ARCH_OMAP1 is not set
 CONFIG_ARCH_OMAP2PLUS=y
 
 #
 # OMAP Feature Selections
 #
-CONFIG_OMAP_SMARTREFLEX=y
-CONFIG_OMAP_SMARTREFLEX_CLASS3=y
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
@@ -61,9 +60,11 @@ CONFIG_MACH_OMAP_GENERIC=y
 # TI OMAP2/3/4 Specific Features
 #
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+CONFIG_SOC_HAS_OMAP2_SDRC=y
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
+CONFIG_SOC_OMAP5=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
 CONFIG_SOC_AM33XX=y
@@ -76,7 +77,7 @@ CONFIG_OMAP_PACKAGE_CBS=y
 #
 # OMAP Board Type
 #
-CONFIG_MACH_OMAP3_BEAGLE=y
+
 CONFIG_MACH_DEVKIT8000=y
 CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP3530_LV_SOM=y
@@ -86,7 +87,7 @@ CONFIG_MACH_OMAP3EVM=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_CRANEBOARD=y
 CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_OMAP3_TOUCHBOOK=y
+CONFIG_MACH_TOUCHBOOK=y
 CONFIG_MACH_OMAP_3430SDP=y
 CONFIG_MACH_NOKIA_RM680=y
 CONFIG_MACH_NOKIA_RX51=y
@@ -172,6 +173,7 @@ CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=2
 CONFIG_HOTPLUG_CPU=y
 CONFIG_LOCAL_TIMERS=y
+CONFIG_ARCH_NR_GPIO=512
 CONFIG_HZ=128
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
@@ -182,6 +184,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
 # At least one emulation must be selected
@@ -212,7 +215,6 @@ CONFIG_XPS=y
 # Generic Driver Options
 #
 CONFIG_REGMAP_I2C=y
-# CONFIG_CMA is not set
 CONFIG_MTD=y
 CONFIG_MTD_TESTS=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -361,6 +363,7 @@ CONFIG_I2C=y
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OMAP=y
 
 #
@@ -402,6 +405,8 @@ CONFIG_OMAP_WATCHDOG=y
 #
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
@@ -417,11 +422,12 @@ CONFIG_TWL6040_CORE=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM8350_I2C is not set
@@ -446,6 +452,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
+CONFIG_REGULATOR_LP872X=y
 CONFIG_REGULATOR_TPS62360=m
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
@@ -453,15 +460,11 @@ CONFIG_REGULATOR_TPS65090=m
 CONFIG_REGULATOR_TWL4030=y
 
 #
-# Miscelaneous helper chips
+# Webcam and/or TV USB devices
 #
 # CONFIG_VIDEO_VPFE_CAPTURE is not set
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP2_VOUT=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
 # CONFIG_TTPCI_EEPROM is not set
 
 #
@@ -525,7 +528,6 @@ CONFIG_USB_OHCI_HCD_OMAP3=y
 # OTG and related infrastructure
 #
 CONFIG_USB_GPIO_VBUS=y
-# CONFIG_ISP1301_OMAP is not set
 CONFIG_TWL4030_USB=y
 CONFIG_TWL6030_USB=y
 CONFIG_MMC=y
@@ -558,6 +560,12 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # CONFIG_RTC_DRV_TWL4030 is not set
 
+#
+# DMA Devices
+#
+CONFIG_DMA_OMAP=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+
 #
 # DMA Clients
 #
@@ -578,6 +586,9 @@ CONFIG_DRM_OMAP_NUM_CRTCS=1
 #
 # Android
 #
+CONFIG_OMAP_BANDGAP=m
+CONFIG_OMAP4_THERMAL=y
+CONFIG_OMAP5_THERMAL=y
 CONFIG_HWSPINLOCK=m
 
 #
@@ -591,6 +602,11 @@ CONFIG_HWSPINLOCK_OMAP=m
 #
 CONFIG_TI_EMIF=m
 
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+
 #
 # Pseudo filesystems
 #
@@ -602,8 +618,8 @@ CONFIG_TI_EMIF=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_OC_ETM=y
+# CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
 # Non-executable pages