kernel: Update to version 4.1.3

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index c73a0663d7e3632a24067c940c9e9d19db407977..b9b348e5bf30e1f7863621e7e75756d1fe5b7569 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -1,9 +1,11 @@
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
+CONFIG_PGTABLE_LEVELS=2
 
 #
 # IRQ subsystem
 #
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 
@@ -61,6 +63,11 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_PM_OPP=y
 CONFIG_CPU_PM=y
 
+#
+# ARM CPU Idle Drivers
+#
+# CONFIG_ARM_CPUIDLE is not set
+
 #
 # CPU Frequency scaling
 #
@@ -103,6 +110,9 @@ CONFIG_CMA_ALIGNMENT=8
 #
 # Bus devices
 #
+CONFIG_ARM_CCI=y
+CONFIG_ARM_CCI400_COMMON=y
+CONFIG_ARM_CCI400_PMU=y
 # CONFIG_ARM_CCN is not set
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_DTC=y
@@ -124,6 +134,10 @@ CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_PARPORT is not set
+
+#
+# Protocols
+#
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -146,10 +160,7 @@ CONFIG_VEXPRESS_SYSCFG=y
 # SCSI Transports
 #
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC94XX_DEBUG=y
-CONFIG_SCSI_MVSAS_DEBUG=y
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 
@@ -196,7 +207,6 @@ CONFIG_SMC91X=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_ATH5K_DEBUG is not set
 CONFIG_WIL6210_TRACING=y
 # CONFIG_IPW2100_MONITOR is not set
 # CONFIG_IPW2200_MONITOR is not set
@@ -210,6 +220,7 @@ CONFIG_WIL6210_TRACING=y
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_TC3589X is not set
 # CONFIG_KEYBOARD_CAP11XX is not set
+CONFIG_KEYBOARD_BCM=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
@@ -271,26 +282,27 @@ CONFIG_OF_GPIO=y
 CONFIG_GPIO_GENERIC=y
 
 #
-# Memory mapped GPIO drivers:
+# Memory mapped GPIO drivers
 #
 CONFIG_GPIO_74XX_MMIO=m
+CONFIG_GPIO_ALTERA=m
 CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_SYSCON is not set
 
 #
-# I2C GPIO expanders:
+# I2C GPIO expanders
 #
-# CONFIG_GPIO_STMPE is not set
 CONFIG_GPIO_ADNP=m
 
 #
-# SPI GPIO expanders:
+# MFD GPIO expanders
 #
-# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_STMPE is not set
+# CONFIG_GPIO_TC3589X is not set
 
 #
-# USB GPIO expanders:
+# USB GPIO expanders
 #
 # CONFIG_MAX8925_POWER is not set
 # CONFIG_WM831X_BACKUP is not set
@@ -310,12 +322,17 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_LTC2952=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 
 #
 # Native drivers
 #
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_VEXPRESS=m
+
+#
+# ACPI drivers
+#
 CONFIG_THERMAL_OF=y
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CLOCK_THERMAL=y
@@ -346,6 +363,7 @@ CONFIG_MFD_STMPE=y
 # STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_STMPE_I2C=y
+CONFIG_MFD_TC3589X=y
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
@@ -391,6 +409,7 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_DVB_PT1 is not set
 # CONFIG_MANTIS_CORE is not set
 # CONFIG_DVB_NGENE is not set
+# CONFIG_VIDEO_XILINX is not set
 
 #
 # DVB-S (satellite) frontends
@@ -419,6 +438,7 @@ CONFIG_DVB_LNBP21=y
 # I2C encoder or helper chips
 #
 CONFIG_DRM_PTN3460=m
+CONFIG_DRM_PS8622=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_NOUVEAU is not set
 
@@ -460,6 +480,7 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -519,16 +540,23 @@ CONFIG_SND_SOC_WM8750=m
 CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_SOC_WM8776=m
 CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD=m
 
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_CHIPIDEA_OF=m
+
 #
 # USB Physical Layer drivers
 #
 CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
 
 #
 # MMC/SD/SDIO Host Controller Drivers
@@ -570,7 +598,6 @@ CONFIG_RTC_DRV_SNVS=m
 #
 # CONFIG_DW_DMAC is not set
 CONFIG_FSL_EDMA=m
-CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
 #
@@ -590,24 +617,13 @@ 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
+CONFIG_COMMON_CLK_PWM=m
 
 #
 # Clock Source drivers
 #
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
-CONFIG_CLKSRC_VERSATILE=y
 
 #
 # Analog to digital converters
@@ -626,6 +642,11 @@ CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_IRQCHIP=y
 
+#
+# Firmware Drivers
+#
+# CONFIG_FIRMWARE_MEMMAP is not set
+
 #
 # RCU Debugging
 #
@@ -636,6 +657,7 @@ CONFIG_IRQCHIP=y
 #
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 CONFIG_DEBUG_RODATA=y
+# CONFIG_CORESIGHT is not set
 
 #
 # Logging Options