diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-08 18:28:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-08 18:28:47 -0700 |
| commit | b0dc81a9831bc28ee5aa4190f9766bb0b25d836e (patch) | |
| tree | e8b34390876bd387f3d865119d2003b57b8c13b4 | |
| parent | ae2dd2807dccf04099694e9f83621a540f53e8b5 (diff) | |
| parent | b98ee859fcf87c3d4fc0f1a8a03ab38f36e50af8 (diff) | |
Merge "media: camera: Fix Major and Minor number"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c | 6 | ||||
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c b/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c index 79231fb314ad..ae3f7e89a8b4 100644 --- a/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c +++ b/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -25,8 +25,8 @@ #define MSM_CAMERA_TZ_BOOT_PROTECTED (false) /* Update version major number in case the HLOS-TA interface is changed*/ -#define TA_IF_VERSION_MAJ 1 -#define TA_IF_VERSION_MIN 2 +#define TA_IF_VERSION_MAJ 2 +#define TA_IF_VERSION_MIN 1 #undef CDBG #ifdef MSM_CAMERA_TZ_UTIL_VERBOSE diff --git a/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h b/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h index 146b7d029984..eaa77db3957c 100644 --- a/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h +++ b/drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -29,7 +29,7 @@ #define MSM_CAMERA_TZ_HW_BLOCK_CPP 0x0000000010 enum msm_camera_tz_cmd_id_t { - MSM_CAMERA_TZ_CMD_NONE, + MSM_CAMERA_TZ_CMD_NONE = 56000, MSM_CAMERA_TZ_CMD_GET_IF_VERSION, MSM_CAMERA_TZ_CMD_POWER_UP, MSM_CAMERA_TZ_CMD_POWER_DOWN, |