From b7a7d21b21f50272dc950bc6a15c139c27873ce5 Mon Sep 17 00:00:00 2001 From: xxm Date: Mon, 21 Jul 2014 18:49:52 +0800 Subject: [PATCH] rockchip:iommu:update function rockchip_vcodec_select --- drivers/iommu/rockchip-iommu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) -- 2.34.1