commit 0231cde5291bb326dfb58330cdb7bfac4756f3c2
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 21 21:12:44 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 21 21:12:44 2013 -0800
tree 001690c48e25030bd145883ae8420412729cafc4
parent 9a5fc7f69254d9d5dc577966cfde082163c3f414
parent c2dee742e4be2d7981fd74d22c297b812d6a31c0

Merge "msm_shared: scm: Using correct service name for memory protection"

platform/msm_shared/include/scm.h

diff --git a/platform/msm_shared/include/scm.h b/platform/msm_shared/include/scm.h
index 418574b..8f7c235 100644
--- a/platform/msm_shared/include/scm.h
+++ b/platform/msm_shared/include/scm.h
@@ -66,7 +66,7 @@
 #define SSD_DECRYPT_ID              0x01
 #define SSD_ENCRYPT_ID              0x02
 
-#define SCM_SVC_SSD                 0x0C
+#define SVC_MEMORY_PROTECTION       0x0C
 #define IOMMU_SECURE_CFG            0x02
 
 #define SECURE_DEVICE_MDSS          1

platform/msm_shared/scm.c

diff --git a/platform/msm_shared/scm.c b/platform/msm_shared/scm.c
index 7edcc2b..dae8723 100644
--- a/platform/msm_shared/scm.c
+++ b/platform/msm_shared/scm.c
@@ -190,7 +190,7 @@
 	secure_cfg.id    = 1;
 	secure_cfg.spare = 0;
 
-	ret = scm_call(SCM_SVC_SSD, IOMMU_SECURE_CFG, &secure_cfg, sizeof(secure_cfg),
+	ret = scm_call(SVC_MEMORY_PROTECTION, IOMMU_SECURE_CFG, &secure_cfg, sizeof(secure_cfg),
 			&scm_ret, sizeof(scm_ret));
 
 	if (ret || scm_ret) {