Merge "msm: camera: Add support for nominal l1 clock" into dev/msm-4.9-camx (83f3e10d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -46,8 +46,10 @@ static const char *cam_soc_util_get_string_from_level(
		return "SVSL1[4]";
		case CAM_NOMINAL_VOTE:
		return "NOM[5]";
		case CAM_NOMINALL1_VOTE:
		return "NOML1[6]";
		case CAM_TURBO_VOTE:
		return "TURBO[6]";
		return "TURBO[7]";
		default:
		return "";
		}
		@@ -227,6 +229,8 @@ int cam_soc_util_get_level_from_string(const char *string,
		*level = CAM_SVSL1_VOTE;
		} else if (!strcmp(string, "nominal")) {
		*level = CAM_NOMINAL_VOTE;
		} else if (!strcmp(string, "nominal_l1")) {
		*level = CAM_NOMINALL1_VOTE;
		} else if (!strcmp(string, "turbo")) {
		*level = CAM_TURBO_VOTE;
		} else {

+10 −8

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		* @CAM_SVS_VOTE : SVS vote
		* @CAM_SVSL1_VOTE : SVS Plus vote
		* @CAM_NOMINAL_VOTE : Nominal vote
		* @CAM_NOMINALL1_VOTE: Nominal plus vote
		* @CAM_TURBO_VOTE : Turbo vote
		* @CAM_MAX_VOTE : Max voting level, This is invalid level.
		*/
		@@ -60,6 +61,7 @@ enum cam_vote_level {
		CAM_SVS_VOTE,
		CAM_SVSL1_VOTE,
		CAM_NOMINAL_VOTE,
		CAM_NOMINALL1_VOTE,
		CAM_TURBO_VOTE,
		CAM_MAX_VOTE,
		};