kernel: Update to 3.14.2.

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

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 5b3431a9acb140322d333e855a56dbf150ed7d94..c753196f1ec1796b11d8781acd10339d406ee19c 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -57,8 +57,8 @@ CONFIG_LBDAF=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_MSM_NODT is not set
+# CONFIG_ARCH_SHMOBILE_LEGACY is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C24XX is not set
@@ -249,6 +249,7 @@ CONFIG_NET_VENDOR_FARADAY=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
 CONFIG_MV643XX_ETH=m
+CONFIG_MVNETA=m
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX4_CORE is not set
 CONFIG_AX88796=m
@@ -272,7 +273,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # Input Device Drivers
 #
-# CONFIG_KEYBOARD_SH_KEYSC is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
 
 #
 # Hardware I/O ports
@@ -297,6 +298,11 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_ST_ASC=m
 # CONFIG_HVC_DCC is not set
 
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+
 #
 # PC SMBus host controller drivers
 #
@@ -310,8 +316,6 @@ CONFIG_I2C_SIS630=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-CONFIG_I2C_SH_MOBILE=m
-CONFIG_I2C_RCAR=m
 
 #
 # Pin controllers
@@ -319,6 +323,10 @@ CONFIG_I2C_RCAR=m
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
+# CONFIG_PINCTRL_AS3722 is not set
+# CONFIG_PINCTRL_CAPRI is not set
+CONFIG_PINCTRL_MSM=y
+CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -348,6 +356,7 @@ CONFIG_GPIO_BCM_KONA=y
 #
 # CONFIG_APM_POWER is not set
 # CONFIG_CHARGER_MANAGER is not set
+CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_POWER_RESET_RESTART=y
@@ -357,22 +366,26 @@ CONFIG_POWER_RESET_VEXPRESS=y
 # Native drivers
 #
 CONFIG_SENSORS_VEXPRESS=m
+# CONFIG_THERMAL_OF is not set
 
 #
 # Watchdog Device Drivers
 #
+# CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 
 #
 # Multifunction device drivers
 #
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_HTC_EGPIO is not set
 
 #
 # STMicroelectronics STMPE Interface Drivers
 #
+CONFIG_TWL4030_POWER=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
@@ -382,10 +395,39 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AS3722=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9063=m
 CONFIG_REGULATOR_DA9210=m
 CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_PALMAS=m
 CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
 
 #
 # Media digital TV PCI Adapters
@@ -435,6 +477,12 @@ CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SIMPLE_CARD=m
 
+#
+# USB Imaging devices
+#
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
+
 #
 # USB Physical Layer drivers
 #
@@ -445,11 +493,13 @@ CONFIG_USB_ULPI=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
+CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_DW=m
-# CONFIG_MMC_DW_IDMAC is not set
+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
 
 #
@@ -462,6 +512,12 @@ CONFIG_LEDS_REGULATOR=m
 #
 # CONFIG_EDAC is not set
 
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_AS3722=m
+CONFIG_RTC_DRV_HYM8563=m
+
 #
 # on-CPU RTC drivers
 #
@@ -479,6 +535,13 @@ CONFIG_DMA_OF=y
 #
 # Common Clock Framework
 #
+CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
 CONFIG_MVEBU_CLK_COMMON=y
 
 #
@@ -487,7 +550,6 @@ CONFIG_MVEBU_CLK_COMMON=y
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_OF_IOMMU=y
-# CONFIG_SHMOBILE_IOMMU is not set
 
 #
 # Rpmsg drivers
@@ -522,11 +584,13 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m
 #
 # Runtime Testing
 #
+# 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_UART_PL01X is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 
 #
 # Executable Protections