kernel: Update to 3.15.6.

[people/ms/ipfire-3.x.git] / kernel / config-i686-legacy

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index 4ef8e4a8b949748036b5b209685c161d2cd33167..2de8875769135e382e2af10568cc260d3f926ef1 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -1,8 +1,12 @@
 
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_CC_STACKPROTECTOR is not set
+
 #
 # Processor type and features
 #
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_VMSPLIT_3G_OPT is not set
@@ -14,6 +18,10 @@ CONFIG_HIGHMEM4G=y
 #
 # CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_OLPC=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_OLPC=y
 CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
@@ -24,7 +32,18 @@ CONFIG_OLPC_XO15_SCI=y
 # Generic Driver Options
 #
 # CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CMA is not set
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
 
 #
 # Bus devices
@@ -34,18 +53,22 @@ CONFIG_OF=y
 #
 # Device Tree and Open Firmware support
 #
-CONFIG_PROC_DEVICETREE=y
 # CONFIG_OF_SELFTEST is not set
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
+CONFIG_OF_ADDRESS_PCI=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_ARC_EMAC is not set
+CONFIG_BCMGENET=m
+
 #
 # MII PHY device drivers
 #
@@ -57,12 +80,15 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # Input Device Drivers
 #
 CONFIG_MOUSE_PS2_OLPC=y
+CONFIG_INPUT_MAX8997_HAPTIC=m
+# CONFIG_INPUT_GPIO_BEEPER is not set
 CONFIG_INPUT_PWM_BEEPER=m
 
 #
 # Hardware I/O ports
 #
 CONFIG_SERIO_APBPS2=m
+# CONFIG_SERIO_OLPC_APSP is not set
 
 #
 # Serial drivers
@@ -75,6 +101,11 @@ CONFIG_SERIO_APBPS2=m
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
@@ -82,13 +113,24 @@ CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_BCM281XX=y
+CONFIG_PINCTRL_MSM=y
+CONFIG_PINCTRL_MSM8X74=m
+# CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_PALMAS=y
 CONFIG_OF_GPIO=y
 
 #
 # Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_GRGPIO is not set
 
 #
@@ -102,33 +144,67 @@ CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_CS5535=y
 # CONFIG_GPIO_SODAVILLE is not set
 
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
+
+#
+# MODULbus GPIO expanders:
+#
+# CONFIG_GPIO_BCM_KONA is not set
+
 #
 # 1-wire Slaves
 #
 CONFIG_BATTERY_OLPC=y
+CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 
+#
+# ACPI drivers
+#
+# CONFIG_THERMAL_OF is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_GPIO_WATCHDOG is not set
+
 #
 # Multifunction device drivers
 #
-CONFIG_MFD_CORE=y
+CONFIG_MFD_AS3722=y
 
 #
 # Frame buffer hardware drivers
 #
+# CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_OT200 is not set
 
 #
-# Console display driver support
+# USB Imaging devices
 #
-# CONFIG_FB_SSD1307 is not set
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI_OF_ARASAN=m
 
 #
 # LED drivers
 #
 CONFIG_LEDS_PWM=m
 
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_AS3722=m
+CONFIG_RTC_DRV_HYM8563=m
+
 #
 # on-CPU RTC drivers
 #
@@ -137,6 +213,8 @@ CONFIG_RTC_DRV_SNVS=m
 #
 # DMA Devices
 #
+CONFIG_FSL_EDMA=m
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
 #
@@ -153,6 +231,13 @@ CONFIG_XO1_RFKILL=m
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_SI5351 is not set
+CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
 
 #
 # Hardware Spinlock drivers
@@ -163,11 +248,19 @@ CONFIG_OF_IOMMU=y
 # Analog to digital converters
 #
 # CONFIG_EXYNOS_ADC is not set
+CONFIG_VF610_ADC=m
 
 #
-# Magnetometer sensors
+# Temperature sensors
 #
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_FSL_FTM=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
 CONFIG_IRQCHIP=y
 
 #