kernel: Update to version 4.0.4

[ipfire-3.x.git] / kernel / config-arm-generic

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 1fcc85bf16f5625ea23913a7ff70292d53dcf429..c73a0663d7e3632a24067c940c9e9d19db407977 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -44,7 +44,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 
 #
-# Kernel Features
+# ARM errata workarounds via the alternatives framework
 #
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_HW_PERF_EVENTS=y
@@ -66,6 +66,10 @@ CONFIG_CPU_PM=y
 #
 CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
+
+#
+# CPU frequency scaling drivers
+#
 CONFIG_CPUFREQ_DT=m
 
 #
@@ -84,7 +88,6 @@ CONFIG_BPF_JIT=y
 #
 # Generic Driver Options
 #
-CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_DMA_CMA=y
 
 #
@@ -108,7 +111,7 @@ CONFIG_OF=y
 #
 # Device Tree and Open Firmware support
 #
-# CONFIG_OF_SELFTEST is not set
+# CONFIG_OF_UNITTEST is not set
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
@@ -119,6 +122,7 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
+# CONFIG_OF_OVERLAY is not set
 # CONFIG_PARPORT is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
@@ -149,14 +153,14 @@ CONFIG_SCSI_MVSAS_DEBUG=y
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_OF_PLATFORM is not set
+
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-# CONFIG_I2O_BUS is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
 CONFIG_MII=y
 # CONFIG_ATM_LANAI is not set
 # CONFIG_ATM_ENI is not set
@@ -169,11 +173,9 @@ CONFIG_MII=y
 # Distributed Switch Architecture drivers
 #
 CONFIG_AMD8111_ETH=y
-CONFIG_AMD_XGBE=m
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_ARC_EMAC=m
 CONFIG_EMAC_ROCKCHIP=m
-CONFIG_BCMGENET=m
 CONFIG_SYSTEMPORT=m
 # CONFIG_CHELSIO_T1_1G is not set
 # CONFIG_DE2104X is not set
@@ -191,7 +193,6 @@ CONFIG_SMC91X=m
 #
 # MII PHY device drivers
 #
-CONFIG_AMD_XGBE_PHY=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -208,7 +209,7 @@ CONFIG_WIL6210_TRACING=y
 # CONFIG_KEYBOARD_STMPE is not set
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_TC3589X is not set
-CONFIG_KEYBOARD_CAP1106=m
+# CONFIG_KEYBOARD_CAP11XX is not set
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
@@ -241,6 +242,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 
 #
 # Multiplexer I2C Chip support
@@ -271,8 +273,8 @@ CONFIG_GPIO_GENERIC=y
 #
 # Memory mapped GPIO drivers:
 #
+CONFIG_GPIO_74XX_MMIO=m
 CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_GRGPIO is not set
 
@@ -282,18 +284,13 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_STMPE is not set
 CONFIG_GPIO_ADNP=m
 
-#
-# PCI GPIO expanders:
-#
-# CONFIG_GPIO_BT8XX is not set
-
 #
 # SPI GPIO expanders:
 #
 # CONFIG_GPIO_MCP23S08 is not set
 
 #
-# 1-wire Slaves
+# USB GPIO expanders:
 #
 # CONFIG_MAX8925_POWER is not set
 # CONFIG_WM831X_BACKUP is not set
@@ -321,6 +318,7 @@ CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_VEXPRESS=m
 CONFIG_THERMAL_OF=y
 # CONFIG_CPU_THERMAL is not set
+CONFIG_CLOCK_THERMAL=y
 
 #
 # Watchdog Device Drivers
@@ -339,6 +337,7 @@ CONFIG_GPIO_WATCHDOG=m
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_HI6421_PMIC=m
 # CONFIG_LPC_ICH is not set
+CONFIG_MFD_MAX77686=y
 # CONFIG_MFD_RTSX_PCI is not set
 CONFIG_MFD_RK808=m
 CONFIG_MFD_STMPE=y
@@ -353,6 +352,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MAX77802=m
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_TPS65218=m
@@ -376,7 +377,6 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_VIDEO_CX23885 is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_SAA7134 is not set
 # CONFIG_VIDEO_SAA7164 is not set
 
@@ -418,6 +418,7 @@ CONFIG_DVB_LNBP21=y
 #
 # I2C encoder or helper chips
 #
+CONFIG_DRM_PTN3460=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_NOUVEAU is not set
 
@@ -470,12 +471,15 @@ CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L56=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CS4265=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_HDMI_CODEC=m
@@ -483,6 +487,8 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_RT5631=m
+# CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
@@ -491,11 +497,16 @@ CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_SSM2602_I2C=m
 CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
 CONFIG_SND_SOC_STA350=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
@@ -515,15 +526,20 @@ CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD=m
 
 #
-# USB Imaging devices
+# USB Physical Layer drivers
 #
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
+CONFIG_USB_ULPI=y
 
 #
-# USB Physical Layer drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_USB_ULPI=y
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_IDMAC=y
+CONFIG_MMC_DW_PLTFM=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_MMC_DW_K3=m
+CONFIG_MMC_DW_PCI=m
 
 #
 # LED drivers
@@ -540,7 +556,9 @@ CONFIG_LEDS_SYSCON=y
 #
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_MAX77802=m
 
 #
 # on-CPU RTC drivers
@@ -555,17 +573,31 @@ CONFIG_FSL_EDMA=m
 CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
+#
+# Android
+#
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+# CONFIG_I2O_BUS is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
 #
 # Common Clock Framework
 #
+CONFIG_COMMON_CLK_MAX_GEN=y
+CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SI570=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_IPQ_GCC_806X=m
+CONFIG_IPQ_LCC_806X=m
 CONFIG_MSM_GCC_8660=m
 CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_LCC_8960=m
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_GCC_8974=m
 CONFIG_MSM_MMCC_8974=m
@@ -576,7 +608,6 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_VERSATILE=y
-CONFIG_OF_IOMMU=y
 
 #
 # Analog to digital converters
@@ -604,6 +635,7 @@ CONFIG_IRQCHIP=y
 # Runtime Testing
 #
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
+CONFIG_DEBUG_RODATA=y
 
 #
 # Logging Options