ARM: config: Enable SMMU
Terje Bergstrom [Thu, 25 Jul 2013 08:38:34 +0000 (11:38 +0300)]
Change-Id: Iee255c91de963540fd86c67bbf0a16ee93dce12d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/253309
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Chao Xu <cxu@nvidia.com>

arch/arm/configs/tegra12_android_defconfig

index 293b925..2836d27 100644 (file)
@@ -166,6 +166,7 @@ CONFIG_BCM2079X_NFC=y
 CONFIG_PN544_NFC=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CMA=y
+CONFIG_PLATFORM_ENABLE_IOMMU=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
@@ -317,7 +318,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
 # CONFIG_USB_GSPCA is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_TEGRA_MEDIASERVER is not set
 CONFIG_TEGRA_NVAVP=y
@@ -488,6 +488,7 @@ CONFIG_ANDROID_RAM_CONSOLE=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_INTF_ALARM_DEV=y
+CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_EXTCON=y
 CONFIG_EXTCON_MAX77665=y