Skip to content

Commit 37d2aa6

Browse files
charleskeepaxbroonie
authored andcommitted
ASoC: SDCA: Minor selected/detected mode control fixups
Make the names a slightly better match for the specification and add some constants for the values rather than hard coding. Reviewed-by: Bard Liao <[email protected]> Signed-off-by: Charles Keepax <[email protected]> Reviewed-by: Pierre-Louis Bossart <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent b4515fd commit 37d2aa6

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

include/sound/sdca_function.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,15 @@ enum sdca_selected_mode_range {
319319
SDCA_SELECTED_MODE_NCOLS = 2,
320320
};
321321

322+
/**
323+
* enum sdca_detected_mode_values - Predefined GE Detected Mode values
324+
*/
325+
enum sdca_detected_mode_values {
326+
SDCA_DETECTED_MODE_JACK_UNPLUGGED = 0,
327+
SDCA_DETECTED_MODE_JACK_UNKNOWN = 1,
328+
SDCA_DETECTED_MODE_DETECTION_IN_PROGRESS = 2,
329+
};
330+
322331
/**
323332
* enum sdca_spe_controls - SDCA Controls for Security & Privacy Unit
324333
*

sound/soc/sdca/sdca_asoc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,12 @@ static int entity_early_parse_ge(struct device *dev,
246246
if (!values)
247247
return -ENOMEM;
248248

249-
texts[0] = "No Jack";
249+
texts[0] = "Jack Unplugged";
250250
texts[1] = "Jack Unknown";
251251
texts[2] = "Detection in Progress";
252-
values[0] = 0;
253-
values[1] = 1;
254-
values[2] = 2;
252+
values[0] = SDCA_DETECTED_MODE_JACK_UNPLUGGED;
253+
values[1] = SDCA_DETECTED_MODE_JACK_UNKNOWN;
254+
values[2] = SDCA_DETECTED_MODE_DETECTION_IN_PROGRESS;
255255
for (i = 0; i < range->rows; i++) {
256256
enum sdca_terminal_type type;
257257

0 commit comments

Comments
 (0)