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 29359077aa4e185de518482c279c28ee88126739..c73a0663d7e3632a24067c940c9e9d19db407977 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -122,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
@@ -160,11 +161,6 @@ CONFIG_SCSI_MVSAS_DEBUG=y
 #
 # 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
@@ -177,7 +173,6 @@ 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
@@ -198,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
@@ -248,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
@@ -289,11 +284,6 @@ 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:
 #
@@ -347,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
@@ -361,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
@@ -384,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
 
@@ -426,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
 
@@ -504,6 +497,7 @@ 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
@@ -539,6 +533,7 @@ CONFIG_USB_ULPI=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_PLTFM=m
@@ -561,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
@@ -580,18 +577,27 @@ 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
@@ -629,6 +635,7 @@ CONFIG_IRQCHIP=y
 # Runtime Testing
 #
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
+CONFIG_DEBUG_RODATA=y
 
 #
 # Logging Options