msm: Simplify subsystem ids
Most contexts related to a subsystem (e.g. camera, display)
will all share the same domain. Get rid of all the extra subsystem
ids which just create confusion.
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
diff --git a/arch/arm/mach-msm/iommu_domains.c b/arch/arm/mach-msm/iommu_domains.c
index eb4582e..7ef2204 100644
--- a/arch/arm/mach-msm/iommu_domains.c
+++ b/arch/arm/mach-msm/iommu_domains.c
@@ -158,46 +158,26 @@
};
static struct msm_iommu_domain msm_iommu_subsystems[] = {
- [JPEGD_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [VPE_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [MDP0_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [MDP1_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [ROT_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [IJPEG_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [VFE_SUBSYS_ID] = {
- .domain_idx = GLOBAL_DOMAIN,
- .iova_pool_idx = GLOBAL_MEMORY_POOL,
- },
- [VCODEC_A_SUBSYS_ID] = {
+ [MSM_SUBSYSTEM_VIDEO] = {
.domain_idx = VIDEO_DOMAIN,
.iova_pool_idx = VIDEO_ALLOC_POOL,
},
- [VCODEC_B_SUBSYS_ID] = {
- .domain_idx = VIDEO_DOMAIN,
- .iova_pool_idx = VIDEO_ALLOC_POOL,
- },
- [VIDEO_FWARE_ID] = {
+ [MSM_SUBSYSTEM_VIDEO_FWARE] = {
.domain_idx = VIDEO_DOMAIN,
.iova_pool_idx = VIDEO_FIRMWARE_POOL,
- }
+ },
+ [MSM_SUBSYSTEM_CAMERA] = {
+ .domain_idx = GLOBAL_DOMAIN,
+ .iova_pool_idx = GLOBAL_MEMORY_POOL,
+ },
+ [MSM_SUBSYSTEM_DISPLAY] = {
+ .domain_idx = GLOBAL_DOMAIN,
+ .iova_pool_idx = GLOBAL_MEMORY_POOL,
+ },
+ [MSM_SUBSYSTEM_ROTATOR] = {
+ .domain_idx = GLOBAL_DOMAIN,
+ .iova_pool_idx = GLOBAL_MEMORY_POOL,
+ },
};
struct iommu_domain *msm_subsystem_get_domain(int subsys_id)