qseecom: Rename & unifiy some enum definitions.
Move the key management enum values into unified enum
Rename RPMB related enum definitions as per existing pattern.
Change-Id: I542f934ffc399563a587d5016e974a7ce585f0dc
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
diff --git a/arch/arm/mach-msm/include/mach/qseecomi.h b/arch/arm/mach-msm/include/mach/qseecomi.h
index a4021d4..688dea0 100644
--- a/arch/arm/mach-msm/include/mach/qseecomi.h
+++ b/arch/arm/mach-msm/include/mach/qseecomi.h
@@ -46,8 +46,12 @@
QSEOS_UNLOAD_SERV_IMAGE_COMMAND,
QSEOS_APP_REGION_NOTIFICATION,
QSEOS_REGISTER_LOG_BUF_COMMAND,
- QSEE_RPMB_PROVISION_KEY_COMMAND,
- QSEE_RPMB_ERASE_COMMAND,
+ QSEOS_RPMB_PROVISION_KEY_COMMAND,
+ QSEOS_RPMB_ERASE_COMMAND,
+ QSEOS_GENERATE_KEY = 0x11,
+ QSEOS_DELETE_KEY,
+ QSEOS_MAX_KEY_COUNT,
+ QSEOS_SET_KEY,
QSEOS_CMD_MAX = 0xEFFFFFFF
};
@@ -57,15 +61,6 @@
QSEOS_RESULT_FAILURE = 0xFFFFFFFF
};
-/* Key Management requests */
-enum qseecom_qceos_key_gen_cmd_id {
- QSEOS_GENERATE_KEY = 0x11,
- QSEOS_DELETE_KEY,
- QSEOS_MAX_KEY_COUNT,
- QSEOS_SET_KEY,
- QSEOS_KEY_CMD_MAX = 0xEFFFFFFF
-};
-
enum qseecom_pipe_type {
QSEOS_PIPE_ENC = 0x1,
QSEOS_PIPE_ENC_XTS = 0x2,
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index bd838fc..94449b5 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -890,8 +890,8 @@
data->type = QSEECOM_SECURE_SERVICE;
switch (req.cmd_id) {
- case QSEE_RPMB_PROVISION_KEY_COMMAND:
- case QSEE_RPMB_ERASE_COMMAND:
+ case QSEOS_RPMB_PROVISION_KEY_COMMAND:
+ case QSEOS_RPMB_ERASE_COMMAND:
if (__qseecom_process_rpmb_svc_cmd(data, &req,
&send_svc_ireq))
return -EINVAL;