samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: utils: Consume upstream api for io" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Haritha Chintalapati
2020-12-22 18:24:29 -08:00
committed by Gerrit - the friendly Code Review server
parent eecf51b957 accaa3a3c6
commit 72bea02a93
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/cam_utils/cam_io_util.c
View File

@@ -16,7 +16,7 @@ int cam_io_w(uint32_t data, void __iomem *addr)
return -EINVAL;
CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
writel_relaxed_no_log(data, addr);
writel_relaxed(data, addr);
return 0;
}
@@ -27,11 +27,7 @@ int cam_io_w_mb(uint32_t data, void __iomem *addr)
return -EINVAL;
CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
/* Ensure previous writes are done */
wmb();
writel_relaxed_no_log(data, addr);
/* Ensure previous writes are done */
wmb();
writel(data, addr);
return 0;
}
@@ -60,12 +56,8 @@ uint32_t cam_io_r_mb(void __iomem *addr)
return 0;
}
/* Ensure previous read is done */
rmb();
data = readl_relaxed(addr);
data = readl(addr);
CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
/* Ensure previous read is done */
rmb();
return data;
}