kernel: Update to 3.14.2.

[ipfire-3.x.git] / kernel / config-armv7hl-lpae

diff --git a/kernel/config-armv7hl-lpae b/kernel/config-armv7hl-lpae
index e1e6180fd273cc47057f3ac6c70a2a67f9a444ac..510572345efe263309160ef6dcba56398b2a535f 100644 (file)
--- a/kernel/config-armv7hl-lpae
+++ b/kernel/config-armv7hl-lpae
@@ -25,8 +25,16 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_ARCH_MULTI_V6 is not set
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_BCM is not set
+
+#
+# Marvell Berlin SoC variants
+#
 # CONFIG_ARCH_HIGHBANK is not set
 # CONFIG_ARCH_KEYSTONE is not set
+
+#
+# Qualcomm MSM SoC Selection
+#
 # CONFIG_ARCH_MXC is not set
 
 #
@@ -37,12 +45,12 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_ARCH_OMAP4 is not set
 # CONFIG_SOC_AM33XX is not set
 # CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_DRA7XX is not set
 
 #
 # TI OMAP2/3/4 Specific Features
 #
 # CONFIG_SOC_HAS_OMAP2_SDRC is not set
-# CONFIG_SOC_DRA7XX is not set
 
 #
 # OMAP Legacy Platform Data Board Type
@@ -50,7 +58,6 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_SIRF is not set
 
@@ -72,10 +79,11 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 #
 CONFIG_ARM_LPAE=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-# CONFIG_CACHE_L2X0 is not set
+CONFIG_CACHE_PL310=y
 # CONFIG_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_643719 is not set
 # CONFIG_ARM_ERRATA_720789 is not set
+CONFIG_PL310_ERRATA_753970=y
 # CONFIG_ARM_ERRATA_754322 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
@@ -134,7 +142,7 @@ CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
 # Generic Driver Options
 #
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_MMIO=m
 
 #
 # Bus devices
@@ -217,6 +225,10 @@ CONFIG_PRINTER=m
 CONFIG_LP_CONSOLE=y
 CONFIG_PPDEV=m
 CONFIG_HW_RANDOM_OMAP=y
+
+#
+# Multiplexer I2C Chip support
+#
 CONFIG_I2C_ALGOBIT=m
 
 #
@@ -234,12 +246,6 @@ CONFIG_I2C_PARPORT=m
 #
 # CONFIG_PPS_CLIENT_PARPORT is not set
 
-#
-# Pin controllers
-#
-# CONFIG_PINMUX is not set
-# CONFIG_PINCONF is not set
-
 #
 # Texas Instruments thermal drivers
 #
@@ -253,7 +259,6 @@ CONFIG_I2C_PARPORT=m
 #
 # Multifunction device drivers
 #
-CONFIG_MFD_CORE=m
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_PMIC_ADP5520 is not set
@@ -327,14 +332,12 @@ CONFIG_MFD_CORE=m
 # CONFIG_TEGRA_HOST1X is not set
 CONFIG_DRM=m
 CONFIG_DRM_USB=m
-CONFIG_DRM_KMS_HELPER=m
 
 #
 # I2C encoder or helper chips
 #
 # CONFIG_DRM_EXYNOS is not set
 CONFIG_DRM_UDL=m
-# CONFIG_DRM_TEGRA is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_FB_MODE_HELPERS is not set
 
@@ -410,6 +413,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 # CONFIG_TI_EDMA is not set
 # CONFIG_DMA_OMAP is not set
 # CONFIG_TI_CPPI41 is not set
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 
 #
 # Microsoft Hyper-V guest support
@@ -438,6 +442,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
+CONFIG_PWM_LP3943=m
 CONFIG_PWM_PCA9685=m
 # CONFIG_PWM_TEGRA is not set