rockchip: iommu: enable rockchip iommu default

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 479bae84b40713a6ce6cddd0558eaaae30d09b09..68c623d33f7a446d0aebad01b8403538b769b641 100755 (executable)
--- 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