diff options
author | Stephen Warren <swarren@nvidia.com> | 2014-03-21 16:56:58 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-26 18:17:34 -0400 |
commit | 0c86f089e66a9323d39ecb89d77190ca70b30931 (patch) | |
tree | ce7818da95be012dc0572e6fc9b4b64f8084d303 /arch/arm/configs | |
parent | 3545992ba7c59bff9c556d103190be94da3f013e (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_defconfig | 4 |
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 | |||
101 | CONFIG_DEVTMPFS=y | 101 | CONFIG_DEVTMPFS=y |
102 | CONFIG_DEVTMPFS_MOUNT=y | 102 | CONFIG_DEVTMPFS_MOUNT=y |
103 | CONFIG_DMA_CMA=y | 103 | CONFIG_DMA_CMA=y |
104 | CONFIG_CMA_SIZE_MBYTES=64 | ||
104 | CONFIG_OMAP_OCP2SCP=y | 105 | CONFIG_OMAP_OCP2SCP=y |
105 | CONFIG_MTD=y | 106 | CONFIG_MTD=y |
106 | CONFIG_MTD_M25P80=y | 107 | CONFIG_MTD_M25P80=y |
@@ -169,6 +170,7 @@ CONFIG_SERIAL_ST_ASC=y | |||
169 | CONFIG_SERIAL_ST_ASC_CONSOLE=y | 170 | CONFIG_SERIAL_ST_ASC_CONSOLE=y |
170 | CONFIG_I2C_CHARDEV=y | 171 | CONFIG_I2C_CHARDEV=y |
171 | CONFIG_I2C_MUX=y | 172 | CONFIG_I2C_MUX=y |
173 | CONFIG_I2C_MUX_PCA954x=y | ||
172 | CONFIG_I2C_MUX_PINCTRL=y | 174 | CONFIG_I2C_MUX_PINCTRL=y |
173 | CONFIG_I2C_DESIGNWARE_PLATFORM=y | 175 | CONFIG_I2C_DESIGNWARE_PLATFORM=y |
174 | CONFIG_I2C_MV64XXX=y | 176 | CONFIG_I2C_MV64XXX=y |
@@ -225,6 +227,8 @@ CONFIG_REGULATOR_VEXPRESS=y | |||
225 | CONFIG_MEDIA_SUPPORT=y | 227 | CONFIG_MEDIA_SUPPORT=y |
226 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 228 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
227 | CONFIG_MEDIA_USB_SUPPORT=y | 229 | CONFIG_MEDIA_USB_SUPPORT=y |
230 | CONFIG_USB_VIDEO_CLASS=y | ||
231 | CONFIG_USB_GSPCA=y | ||
228 | CONFIG_DRM=y | 232 | CONFIG_DRM=y |
229 | CONFIG_DRM_TEGRA=y | 233 | CONFIG_DRM_TEGRA=y |
230 | CONFIG_DRM_PANEL_SIMPLE=y | 234 | CONFIG_DRM_PANEL_SIMPLE=y |