xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

Browse Source 
Conflicts:
	drivers/iommu/arm-smmu.c
This commit is contained in:
Joerg Roedel
2014-12-02 13:07:13 +01:00
parent 99cb9aee77 263bc3fd6a 11175886da e222d6a425 2d565a57f2 cc4f14aa17 1c51099a42 18f2340990
commit 76771c938e
1388 changed files with 26441 additions and 11803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iommu/msm_iommu.c
View File

@@ -73,8 +73,7 @@ fail:
static void __disable_clocks(struct msm_iommu_drvdata *drvdata)
{
if (drvdata->clk)
clk_disable(drvdata->clk);
clk_disable(drvdata->clk);
clk_disable(drvdata->pclk);
}
@@ -681,6 +680,7 @@ static const struct iommu_ops msm_iommu_ops = {
.detach_dev = msm_iommu_detach_dev,
.map = msm_iommu_map,
.unmap = msm_iommu_unmap,
.map_sg = default_iommu_map_sg,
.iova_to_phys = msm_iommu_iova_to_phys,
.pgsize_bitmap = MSM_IOMMU_PGSIZES,
};