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

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

Merge "Ultrasound: Add new proximity format"

parents 245e8685 76685276

drivers/misc/qcom/qdsp6v2/ultrasound/q6usm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -769,7 +769,7 @@ static uint32_t q6usm_ext2int_format(uint32_t ext_format) 
		int_format = US_RAW_FORMAT_V2;

		int_format = US_RAW_FORMAT_V2;

		break;

		break;

	case FORMAT_USPROX:

	case FORMAT_USPROX:

		int_format = US_PROX_FORMAT_V2;

		int_format = US_PROX_FORMAT_V4;

		break;

		break;

	case FORMAT_USGES_SYNC:

	case FORMAT_USGES_SYNC:

		int_format = US_GES_SYNC_FORMAT;

		int_format = US_GES_SYNC_FORMAT;

include/sound/apr_audio-v2.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -7630,7 +7630,7 @@ struct afe_svc_cmd_set_clip_bank_selection { 
/* Ultrasound supported formats */

/* Ultrasound supported formats */

#define US_POINT_EPOS_FORMAT_V2 0x0001272D

#define US_POINT_EPOS_FORMAT_V2 0x0001272D

#define US_RAW_FORMAT_V2        0x0001272C

#define US_RAW_FORMAT_V2        0x0001272C

#define US_PROX_FORMAT_V2       0x0001272E

#define US_PROX_FORMAT_V4       0x0001273B

#define US_RAW_SYNC_FORMAT      0x0001272F

#define US_RAW_SYNC_FORMAT      0x0001272F

#define US_GES_SYNC_FORMAT      0x00012730

#define US_GES_SYNC_FORMAT      0x00012730