aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-03-21 16:56:58 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-26 18:17:34 -0400
commit0c86f089e66a9323d39ecb89d77190ca70b30931 (patch)
treece7818da95be012dc0572e6fc9b4b64f8084d303 /arch/arm/configs
parent3545992ba7c59bff9c556d103190be94da3f013e (diff)
ARM: update multi_v7_defconfig for Tegra
This patch adds the same options to multi_v7_defconfig as were added to tegra_defconfig in commit d1c912c1001f "ARM: tegra: defconfig updates". (CONFIG_POWER_RESET_AS3722 is already enabled here.) Suggested-by: Olof Johansson <olof@lixom.net> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 835c788953d7..ee5f0ebce33f 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -101,6 +101,7 @@ CONFIG_RFKILL_GPIO=y
101CONFIG_DEVTMPFS=y 101CONFIG_DEVTMPFS=y
102CONFIG_DEVTMPFS_MOUNT=y 102CONFIG_DEVTMPFS_MOUNT=y
103CONFIG_DMA_CMA=y 103CONFIG_DMA_CMA=y
104CONFIG_CMA_SIZE_MBYTES=64
104CONFIG_OMAP_OCP2SCP=y 105CONFIG_OMAP_OCP2SCP=y
105CONFIG_MTD=y 106CONFIG_MTD=y
106CONFIG_MTD_M25P80=y 107CONFIG_MTD_M25P80=y
@@ -169,6 +170,7 @@ CONFIG_SERIAL_ST_ASC=y
169CONFIG_SERIAL_ST_ASC_CONSOLE=y 170CONFIG_SERIAL_ST_ASC_CONSOLE=y
170CONFIG_I2C_CHARDEV=y 171CONFIG_I2C_CHARDEV=y
171CONFIG_I2C_MUX=y 172CONFIG_I2C_MUX=y
173CONFIG_I2C_MUX_PCA954x=y
172CONFIG_I2C_MUX_PINCTRL=y 174CONFIG_I2C_MUX_PINCTRL=y
173CONFIG_I2C_DESIGNWARE_PLATFORM=y 175CONFIG_I2C_DESIGNWARE_PLATFORM=y
174CONFIG_I2C_MV64XXX=y 176CONFIG_I2C_MV64XXX=y
@@ -225,6 +227,8 @@ CONFIG_REGULATOR_VEXPRESS=y
225CONFIG_MEDIA_SUPPORT=y 227CONFIG_MEDIA_SUPPORT=y
226CONFIG_MEDIA_CAMERA_SUPPORT=y 228CONFIG_MEDIA_CAMERA_SUPPORT=y
227CONFIG_MEDIA_USB_SUPPORT=y 229CONFIG_MEDIA_USB_SUPPORT=y
230CONFIG_USB_VIDEO_CLASS=y
231CONFIG_USB_GSPCA=y
228CONFIG_DRM=y 232CONFIG_DRM=y
229CONFIG_DRM_TEGRA=y 233CONFIG_DRM_TEGRA=y
230CONFIG_DRM_PANEL_SIMPLE=y 234CONFIG_DRM_PANEL_SIMPLE=y