kernel: Update to 3.18.2

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index c31b8ca221e6f9719c5a7a65237fb93cda2b8b80..2d1f04e31f5a4b0244007730ab18f3a1ef4788cd 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -9,7 +9,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 # IRQ subsystem
 #
 CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
 
 #
 # Timers subsystem
@@ -80,7 +80,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
 # CPU Core family selection
 #
 # CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_HISI=y
 
 #
 # Hisilicon platform type
@@ -93,11 +92,6 @@ CONFIG_ARCH_MXC=y
 #
 # CONFIG_PLAT_SPEAR is not set
 
-#
-# CSR SiRF atlas6/primaII/Marco/Polo Specific Features
-#
-CONFIG_ARM_TIMER_SP804=y
-
 #
 # Processor Type
 #
@@ -120,7 +114,6 @@ CONFIG_MULTI_IRQ_HANDLER=y
 #
 # Bus support
 #
-CONFIG_ARM_AMBA=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCI_STUB is not set
@@ -142,7 +135,6 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HIGHMEM=y
@@ -173,7 +165,7 @@ CONFIG_AUTO_ZRELADDR=y
 #
 CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
+CONFIG_CPUFREQ_DT=m
 
 #
 # ARM CPU frequency scaling drivers
@@ -309,7 +301,9 @@ CONFIG_MII=y
 #
 CONFIG_AMD8111_ETH=y
 CONFIG_AMD_XGBE=m
+CONFIG_ARC_EMAC_CORE=m
 CONFIG_ARC_EMAC=m
+CONFIG_EMAC_ROCKCHIP=m
 CONFIG_NET_CADENCE=y
 CONFIG_BCMGENET=m
 CONFIG_SYSTEMPORT=m
@@ -354,11 +348,6 @@ CONFIG_WIL6210_TRACING=y
 # CONFIG_IPW2200_MONITOR is not set
 # CONFIG_IPW2200_QOS is not set
 
-#
-# Input device support
-#
-# CONFIG_INPUT_FF_MEMLESS is not set
-
 #
 # Userland interfaces
 #
@@ -376,6 +365,7 @@ CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_CAP1106=m
 # CONFIG_INPUT_PM8XXX_VIBRATOR is not set
 CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
 # CONFIG_INPUT_TWL4030_PWRBUTTON is not set
@@ -405,8 +395,6 @@ CONFIG_SERIAL_8250_EM=m
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
 CONFIG_SERIAL_IMX=m
 # CONFIG_SERIAL_JSM is not set
@@ -446,7 +434,6 @@ CONFIG_I2C_RK3X=m
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AS3722 is not set
-# CONFIG_PINCTRL_BCM281XX is not set
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -480,11 +467,6 @@ CONFIG_GPIO_ADNP=m
 #
 # CONFIG_GPIO_MCP23S08 is not set
 
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_GPIO_BCM_KONA=y
-
 #
 # 1-wire Slaves
 #
@@ -504,9 +486,12 @@ CONFIG_GPIO_BCM_KONA=y
 # CONFIG_CHARGER_TPS65090 is not set
 CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_HISI=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_LTC2952=y
 CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_VERSATILE=y
 CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_SYSCON=y
 
 #
 # Native drivers
@@ -520,7 +505,7 @@ CONFIG_THERMAL_OF=y
 # Watchdog Device Drivers
 #
 CONFIG_GPIO_WATCHDOG=m
-CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_IMX2_WDT=m
 
@@ -535,11 +520,13 @@ CONFIG_IMX2_WDT=m
 #
 CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
+CONFIG_MFD_HI6421_PMIC=m
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_LPC_ICH is not set
 CONFIG_MFD_PM8XXX=m
 CONFIG_MFD_PM8921_CORE=m
 # CONFIG_MFD_RTSX_PCI is not set
+CONFIG_MFD_RK808=m
 CONFIG_MFD_STMPE=y
 
 #
@@ -555,6 +542,9 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_VEXPRESS=m
 
@@ -679,7 +669,6 @@ CONFIG_SND_COMPRESS_OFFLOAD=m
 # HD-Audio
 #
 CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_ATMEL_SOC=m
@@ -704,8 +693,10 @@ CONFIG_SND_SOC_IMX_SSI=m
 #
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_IMX_WM8962=m
+CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
 
 #
 # SoC Audio support for SuperH
@@ -720,6 +711,7 @@ CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_CS35L32=m
 CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L56=m
 CONFIG_SND_SOC_CS42L73=m
@@ -729,6 +721,8 @@ CONFIG_SND_SOC_CS4271=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
@@ -737,6 +731,9 @@ CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
 CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
 CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
 CONFIG_SND_SOC_STA350=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
@@ -758,6 +755,7 @@ CONFIG_SND_SOC_WM8776=m
 CONFIG_SND_SOC_WM8804=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
 
@@ -778,7 +776,6 @@ CONFIG_USB_ULPI=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
@@ -790,6 +787,11 @@ CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
 
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_SYSCON=y
+
 #
 # iptables trigger is under Netfilter config (LED target)
 #
@@ -800,13 +802,12 @@ CONFIG_MMC_DW_PCI=m
 #
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_RK808=m
 
 #
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_IMXDI=m
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_PM8XXX=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SNVS=m
@@ -819,11 +820,13 @@ CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_FSL_EDMA=m
 CONFIG_NBPFAXI_DMA=m
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
 #
 # Common Clock Framework
 #
+CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SI570=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_APQ_GCC_8084=m
@@ -848,13 +851,17 @@ CONFIG_OF_IOMMU=y
 #
 CONFIG_VF610_ADC=m
 
+#
+# Digital to analog converters
+#
+CONFIG_MAX5821=m
+
 #
 # Temperature sensors
 #
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
 
 #
 # Memory Debugging
@@ -871,15 +878,12 @@ CONFIG_ARM_GIC=y
 #
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_UNWIND=y
-CONFIG_OLD_MCOUNT=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_IMX_UART_PORT=1
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_PL01X is not set
 # CONFIG_DEBUG_UART_8250 is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_OC_ETM is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 
 #