kernel: Update to version 4.2

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 890b7372458870042abca3d993826087a2d75ba1..f0abbd14fb170b55efac1f2e27324c199b5cb718 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -8,7 +8,6 @@ CONFIG_PGTABLE_LEVELS=2
 #
 CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 
@@ -31,7 +30,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 #
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_RCU_USER_QS=y
-# CONFIG_RCU_FAST_NO_HZ is not set
 CONFIG_RCU_NOCB_CPU_NONE=y
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
@@ -82,7 +80,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 #
 # Power management options
 #
-CONFIG_PM_OPP=y
 CONFIG_CPU_PM=y
 
 #
@@ -99,7 +96,7 @@ CONFIG_CPU_FREQ_STAT=y
 #
 # CPU frequency scaling drivers
 #
-CONFIG_CPUFREQ_DT=m
+CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 
 #
@@ -140,28 +137,16 @@ CONFIG_CMA_ALIGNMENT=8
 # Bus devices
 #
 CONFIG_ARM_CCI=y
+CONFIG_ARM_CCI_PMU=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_ARM_CCI400_PMU=y
+CONFIG_ARM_CCI500_PMU=y
 # CONFIG_ARM_CCN is not set
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_DTC=y
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-# CONFIG_OF_UNITTEST is not set
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-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
 
 #
@@ -191,6 +176,7 @@ CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 # CONFIG_SCSI_MVSAS_TASKLET is not set
+# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 
 #
@@ -213,10 +199,6 @@ CONFIG_MII=y
 # Distributed Switch Architecture drivers
 #
 CONFIG_AMD8111_ETH=y
-CONFIG_ARC_EMAC_CORE=m
-CONFIG_ARC_EMAC=m
-CONFIG_EMAC_ROCKCHIP=m
-CONFIG_SYSTEMPORT=m
 # CONFIG_CHELSIO_T1_1G is not set
 # CONFIG_DE2104X is not set
 # CONFIG_TULIP_MMIO is not set
@@ -233,9 +215,6 @@ CONFIG_SMC91X=m
 #
 # MII PHY device drivers
 #
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_WIL6210_TRACING=y
 # CONFIG_IPW2100_MONITOR is not set
 # CONFIG_IPW2200_MONITOR is not set
@@ -246,10 +225,7 @@ CONFIG_WIL6210_TRACING=y
 #
 # CONFIG_KEYBOARD_ADP5520 is not set
 # CONFIG_KEYBOARD_STMPE is not set
-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
@@ -262,7 +238,6 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
 # Hardware I/O ports
 #
 # CONFIG_SERIO_AMBAKMI is not set
-CONFIG_SERIO_APBPS2=m
 
 #
 # Character devices
@@ -273,6 +248,11 @@ CONFIG_SERIO_APBPS2=m
 # CONFIG_SYNCLINK_GT is not set
 # CONFIG_NOZOMI is not set
 
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250_INGENIC=y
+
 #
 # Non-8250 serial port support
 #
@@ -285,7 +265,6 @@ 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
@@ -304,35 +283,22 @@ CONFIG_I2C_SIS630=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_RK3X=m
 CONFIG_I2C_VERSATILE=m
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_GENERIC=y
 
 #
 # Memory mapped GPIO drivers
 #
-CONFIG_GPIO_74XX_MMIO=m
-CONFIG_GPIO_ALTERA=m
-CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
 CONFIG_GPIO_PL061=y
-# CONFIG_GPIO_SYSCON is not set
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADNP=m
 
 #
 # MFD GPIO expanders
 #
-# CONFIG_GPIO_STMPE is not set
 # CONFIG_GPIO_TC3589X is not set
 
 #
@@ -351,12 +317,7 @@ CONFIG_GPIO_ADNP=m
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
 CONFIG_POWER_RESET_AS3722=y
-CONFIG_POWER_RESET_GPIO=y
-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
@@ -364,17 +325,9 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 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
-
 #
 # Watchdog Device Drivers
 #
-CONFIG_GPIO_WATCHDOG=m
 CONFIG_ARM_SP805_WATCHDOG=m
 
 #
@@ -386,31 +339,18 @@ CONFIG_ARM_SP805_WATCHDOG=m
 #
 # Multifunction device drivers
 #
-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
 
 #
 # STMicroelectronics STMPE Interface Drivers
 #
-CONFIG_STMPE_I2C=y
-CONFIG_MFD_TC3589X=y
 # CONFIG_MFD_VX855 is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 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_MAX77686=m
-CONFIG_REGULATOR_MAX77802=m
 CONFIG_REGULATOR_PWM=m
-CONFIG_REGULATOR_RK808=m
-CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_VEXPRESS=m
 
 #
@@ -446,7 +386,6 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_MANTIS_CORE is not set
 # CONFIG_DVB_NGENE is not set
 # CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_XILINX is not set
 
 #
 # DVB-S (satellite) frontends
@@ -475,27 +414,11 @@ CONFIG_DVB_LNBP21=y
 # I2C encoder or helper chips
 #
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
-CONFIG_DRM_PTN3460=m
-CONFIG_DRM_PS8622=m
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_NOUVEAU is not set
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_S6E8AA0 is not set
-
-#
-# Frame buffer Devices
-#
-# CONFIG_FB_BACKLIGHT is not set
 
 #
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_ARMCLCD is not set
-# CONFIG_FB_SSD1307 is not set
 # CONFIG_LCD_PLATFORM is not set
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
@@ -515,6 +438,7 @@ CONFIG_SND_COMPRESS_OFFLOAD=m
 # HD-Audio
 #
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
@@ -534,6 +458,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 #
 # CODEC drivers
 #
+CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_ADAU1701=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4642=m
@@ -570,6 +495,7 @@ CONFIG_SND_SOC_STA32X=m
 CONFIG_SND_SOC_STA350=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
 CONFIG_SND_SOC_TFA9879=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
@@ -595,11 +521,6 @@ 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
 #
@@ -611,7 +532,6 @@ CONFIG_USB_ULPI_VIEWPORT=y
 #
 CONFIG_MMC_ARMMMCI=m
 # CONFIG_MMC_RICOH_MMC is not set
-CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_PLTFM=m
@@ -624,26 +544,11 @@ CONFIG_MMC_DW_PCI=m
 #
 CONFIG_LEDS_PWM=m
 
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_SYSCON=y
-
-#
-# I2C RTC drivers
-#
-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
 #
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
-CONFIG_RTC_DRV_SNVS=m
 
 #
 # DMA Devices
@@ -652,8 +557,6 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
 # CONFIG_PL330_DMA is not set
-CONFIG_FSL_EDMA=m
-CONFIG_DMA_OF=y
 
 #
 # DMA Clients
@@ -667,11 +570,6 @@ 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
@@ -680,11 +578,7 @@ CONFIG_COMMON_CLK_WM831X=y
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_VEXPRESS_OSC=y
-CONFIG_COMMON_CLK_MAX_GEN=y
 CONFIG_COMMON_CLK_MAX77686=y
-CONFIG_COMMON_CLK_MAX77802=m
-CONFIG_COMMON_CLK_RK808=m
-CONFIG_COMMON_CLK_SI570=m
 CONFIG_COMMON_CLK_PWM=m
 
 #
@@ -694,19 +588,21 @@ CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_TIMER_SP804=y
 CONFIG_ARM_MHU=m
 
 #
-# Analog to digital converters
+# Generic IOMMU Pagetable Support
 #
-# CONFIG_LP8788_ADC is not set
-# CONFIG_TWL6030_GPADC is not set
-CONFIG_VF610_ADC=m
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 
 #
-# Digital to analog converters
+# Analog to digital converters
 #
-CONFIG_MAX5821=m
+# CONFIG_LP8788_ADC is not set
+# CONFIG_TWL6030_GPADC is not set
 
 #
 # Temperature sensors
@@ -718,7 +614,6 @@ CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_TWL is not set
 # CONFIG_PWM_TWL_LED is not set
-CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 
 #