From: ljf Date: Fri, 8 Aug 2014 06:59:23 +0000 (+0800) Subject: rk3288: get compatible name of iommu using macro defintion X-Git-Tag: firefly_0821_release~4925 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3aa325ec14abc91137255f8897066b44bb0d05b0;p=firefly-linux-kernel-4.4.55.git rk3288: get compatible name of iommu using macro defintion --- diff --git a/arch/arm/mach-rockchip/vcodec_service.c b/arch/arm/mach-rockchip/vcodec_service.c index 03f427ec4e11..88aea8447f20 100755 --- a/arch/arm/mach-rockchip/vcodec_service.c +++ b/arch/arm/mach-rockchip/vcodec_service.c @@ -1659,9 +1659,9 @@ static int vcodec_probe(struct platform_device *pdev) } if (pservice->hw_info->hw_id == HEVC_ID) - sprintf(mmu_dev_dts_name, "iommu,hevc_mmu"); + sprintf(mmu_dev_dts_name, HEVC_IOMMU_COMPATIBLE_NAME); else - sprintf(mmu_dev_dts_name, "iommu,vpu_mmu"); + sprintf(mmu_dev_dts_name, VPU_IOMMU_COMPATIBLE_NAME); pservice->mmu_dev = rockchip_get_sysmmu_device_by_compatible(mmu_dev_dts_name); diff --git a/drivers/video/rockchip/iep/iep_drv.c b/drivers/video/rockchip/iep/iep_drv.c index 4ad9217f60e0..24f6585069d2 100755 --- a/drivers/video/rockchip/iep/iep_drv.c +++ b/drivers/video/rockchip/iep/iep_drv.c @@ -937,7 +937,7 @@ static int iep_drv_probe(struct platform_device *pdev) IEP_INFO("iep ion client create success!\n"); } - mmu_dev = rockchip_get_sysmmu_device_by_compatible("iommu,iep_mmu"); + mmu_dev = rockchip_get_sysmmu_device_by_compatible(IEP_IOMMU_COMPATIBLE_NAME); if (mmu_dev) { platform_set_sysmmu(mmu_dev, &pdev->dev);