From: simon <xxm@rock-chips.com>
Date: Fri, 22 Aug 2014 07:14:45 +0000 (+0800)
Subject: rockchip: iommu: enable rockchip iommu default
X-Git-Tag: firefly_0821_release~4818
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f49e4666a89dac83e54a2195b5f2095c20694203;p=firefly-linux-kernel-4.4.55.git

rockchip: iommu: enable rockchip iommu default
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 479bae84b407..68c623d33f7a 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -391,9 +391,9 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_RK_SOC=y
 CONFIG_SND_RK_SOC_HDMI_I2S=y
-CONFIG_SND_RK_SOC_RK312X=y
 CONFIG_SND_RK_SOC_RT5631=y
 CONFIG_SND_RK_SOC_RT3224=y
+CONFIG_SND_RK_SOC_RK312X=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y
@@ -527,6 +527,8 @@ CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
 CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
 CONFIG_COMMON_CLK_DEBUG=y
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_ROCKCHIP_IOVMM=y
 CONFIG_IIO=y
 CONFIG_ROCKCHIP_ADC=y
 CONFIG_PWM=y