kernel: Update to 3.7.7.

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

diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 39487925fc0c98d9f5e549cd67e123952712dbaa..7d709db57a7792a7ceea9cac488e8878a5a87945 100644 (file)
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -1,9 +1,11 @@
 CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_NEED_MACH_GPIO_H=y
 
 #
 # IRQ subsystem
 #
 CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 
 #
@@ -61,6 +63,7 @@ CONFIG_MACH_OMAP_GENERIC=y
 #
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_HAS_OMAP2_SDRC=y
+CONFIG_SOC_HAS_REALTIME_COUNTER=y
 # CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
@@ -77,7 +80,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
@@ -125,8 +128,10 @@ CONFIG_CPU_HAS_ASID=y
 #
 # Processor Features
 #
-# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_LPAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_OUTER_CACHE=y
@@ -137,7 +142,6 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARCH_HAS_BARRIERS=y
-CONFIG_CPU_HAS_PMU=y
 CONFIG_ARM_ERRATA_430973=y
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
@@ -153,6 +157,7 @@ CONFIG_PL310_ERRATA_727915=y
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
 CONFIG_PL310_ERRATA_769419=y
+CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_GIC=y
 
 #
@@ -169,16 +174,20 @@ CONFIG_SMP_ON_UP=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
-# CONFIG_ARM_ARCH_TIMER is not set
-CONFIG_NR_CPUS=2
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_NR_CPUS=8
 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
-CONFIG_HW_PERF_EVENTS=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
 
 #
 # CPU Frequency scaling
@@ -214,7 +223,13 @@ CONFIG_XPS=y
 #
 # Generic Driver Options
 #
+CONFIG_SYS_HYPERVISOR=y
 CONFIG_REGMAP_I2C=y
+
+#
+# Bus devices
+#
+CONFIG_OMAP_INTERCONNECT=y
 CONFIG_MTD=y
 CONFIG_MTD_TESTS=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -281,7 +296,6 @@ CONFIG_MTD_PHRAM=m
 CONFIG_MTD_NAND_ECC=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
@@ -317,6 +331,13 @@ CONFIG_OF_MTD=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_MG_DISK=m
 CONFIG_MG_DISK_RES=0
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
 
 #
 # Generic fallback / legacy drivers
@@ -331,6 +352,12 @@ CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
 # CONFIG_TI_CPSW is not set
 
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+
 #
 # Input device support
 #
@@ -345,6 +372,7 @@ CONFIG_MOUSE_GPIO=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 CONFIG_INPUT_TWL4030_VIBRA=y
 CONFIG_INPUT_TWL6040_VIBRA=y
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 
 #
 # Serial drivers
@@ -357,7 +385,9 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_VIRTIO_CONSOLE=m
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_I2C=y
 
 #
@@ -374,6 +404,16 @@ CONFIG_I2C_OMAP=y
 #
 # Enable Device Drivers -> PPS to see the PTP clock options.
 #
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+# CONFIG_PINMUX is not set
+# CONFIG_PINCONF is not set
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_EXYNOS4 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 
 #
@@ -381,6 +421,7 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 #
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_TWL4030=y
+CONFIG_GPIO_TWL6040=m
 
 #
 # 1-wire Bus Masters
@@ -399,6 +440,7 @@ CONFIG_GPIO_TWL4030=y
 # CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=y
 # CONFIG_TWL4030_WATCHDOG is not set
+CONFIG_XEN_WDT=m
 
 #
 # Multifunction device drivers
@@ -415,15 +457,18 @@ CONFIG_TWL4030_CORE=y
 # CONFIG_TWL4030_MADC is not set
 CONFIG_TWL4030_POWER=y
 CONFIG_MFD_TWL4030_AUDIO=y
-# CONFIG_TWL6030_PWM is not set
 CONFIG_TWL6040_CORE=y
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TC3589X is not set
+CONFIG_MFD_SMSC=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
 # CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
@@ -445,6 +490,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 CONFIG_REGULATOR_GPIO=y
 # 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
@@ -460,12 +506,26 @@ CONFIG_REGULATOR_TPS65090=m
 CONFIG_REGULATOR_TWL4030=y
 
 #
-# Webcam and/or TV USB devices
+# Multimedia core support
+#
+CONFIG_VIDEO_V4L2=y
+
+#
+# Media drivers
+#
+# CONFIG_IR_RX51 is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
 #
 # CONFIG_VIDEO_VPFE_CAPTURE is not set
 CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP2_VOUT=m
-# CONFIG_TTPCI_EEPROM is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_VIDEO_IR_I2C=y
 
 #
 # I2C encoder or helper chips
@@ -478,6 +538,7 @@ CONFIG_VIDEO_OMAP2_VOUT=m
 #
 # Frame buffer hardware drivers
 #
+CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_OMAP2_VRAM=y
 CONFIG_OMAP2_VRFB=y
 CONFIG_OMAP2_DSS=y
@@ -528,8 +589,6 @@ CONFIG_USB_OHCI_HCD_OMAP3=y
 # OTG and related infrastructure
 #
 CONFIG_USB_GPIO_VBUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_USB=y
 CONFIG_MMC=y
 
 #
@@ -564,17 +623,20 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # DMA Devices
 #
 CONFIG_DMA_OMAP=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-
-#
-# DMA Clients
-#
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
+CONFIG_DMA_VIRTUAL_CHANNELS=y
 
 #
-# Microsoft Hyper-V guest support
+# Xen driver support
 #
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_PRIVCMD=m
 # CONFIG_TIDSPBRIDGE is not set
 
 #
@@ -586,9 +648,7 @@ CONFIG_DRM_OMAP_NUM_CRTCS=1
 #
 # Android
 #
-CONFIG_OMAP_BANDGAP=m
-CONFIG_OMAP4_THERMAL=y
-CONFIG_OMAP5_THERMAL=y
+# CONFIG_OMAP_BANDGAP is not set
 CONFIG_HWSPINLOCK=m
 
 #