Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdb5318e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "media: camera: Fix Major and Minor number"

parents 004c3e87 1a21effa

drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.c

+3 −3
Original line number Diff line number Diff line 
/* 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

drivers/media/platform/msm/camera_v2/common/msm_camera_tz_util.h

+2 −2
Original line number Diff line number Diff line 
/* 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,