From: xxm <xxm@rock-chips.com>
Date: Mon, 21 Jul 2014 10:49:52 +0000 (+0800)
Subject: rockchip:iommu:update function rockchip_vcodec_select
X-Git-Tag: firefly_0821_release~4916^2~189
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7a7d21b21f50272dc950bc6a15c139c27873ce5;p=firefly-linux-kernel-4.4.55.git

rockchip:iommu:update function rockchip_vcodec_select
---

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 412438c6275a..6fe2224e8a63 100755
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -162,14 +162,14 @@ static void rockchip_vcodec_select(const char *string)
 	if(strstr(string,"hevc"))
 	{
 		writel_relaxed(readl_relaxed(RK_GRF_VIRT + RK3036_GRF_SOC_CON1) |
-	       (BIT_VCODEC_SEL) | (BIT_VCODEC_SEL << 16),
-	       RK_GRF_VIRT + RK3036_GRF_SOC_CON1);
+			      (BIT_VCODEC_SEL) | (BIT_VCODEC_SEL << 16),
+			      RK_GRF_VIRT + RK3036_GRF_SOC_CON1);
 	}
 	else if(strstr(string,"vpu"))
 	{
-		writel_relaxed(readl_relaxed(RK_GRF_VIRT + RK3036_GRF_SOC_CON1) |
-	      (BIT_VCODEC_SEL << 16),
-	       RK_GRF_VIRT + RK3036_GRF_SOC_CON1);
+		writel_relaxed((readl_relaxed(RK_GRF_VIRT + RK3036_GRF_SOC_CON1) &
+			       (~BIT_VCODEC_SEL)) | (BIT_VCODEC_SEL << 16),
+			       RK_GRF_VIRT + RK3036_GRF_SOC_CON1);
 	}
 }
 static unsigned long *section_entry(unsigned long *pgtable, unsigned long iova)