diff options
| author | Carter Hsu <carterhsu@google.com> | 2022-11-23 11:08:54 +0800 |
|---|---|---|
| committer | Carter Hsu <carterhsu@google.com> | 2023-07-26 00:22:14 +0000 |
| commit | 8b01f83f919d57dc1357e69b87392f999dc0748f (patch) | |
| tree | c7f867aa331e98f85cfc5925795c5cb8af0a6f2f | |
| parent | 1ec0334c0041fccab7248c8c7c17e6febb48bde9 (diff) | |
| download | aoc-8b01f83f919d57dc1357e69b87392f999dc0748f.tar.gz | |
audio: support more channels capture and the APMG3 mode
Bug: 292144567
Test: verified on test build
Change-Id: I3a106431d4ce3468c8da262181d6ee6628848311
Signed-off-by: Carter Hsu <carterhsu@google.com>
| -rw-r--r-- | alsa/aoc_alsa_ctl.c | 6 | ||||
| -rw-r--r-- | alsa/aoc_alsa_path.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/alsa/aoc_alsa_ctl.c b/alsa/aoc_alsa_ctl.c index 2cda436..fa840e4 100644 --- a/alsa/aoc_alsa_ctl.c +++ b/alsa/aoc_alsa_ctl.c @@ -1925,11 +1925,13 @@ static SOC_ENUM_SINGLE_DECL(sink_4_state_enum, 1, 4, sink_processing_state_texts); /* audio dsp state switch */ -static const char *audio_dsp_state_switch_texts[] = { "Ambient", "Record", "Telephony"}; +static const char *audio_dsp_state_switch_texts[] = { "Ambient", "Record", "Telephony", + "RESERVED_0", "RESERVED_1", "RESERVED_2", + "Telephony_APMG3"}; static SOC_ENUM_SINGLE_DECL(audio_dsp_state_switch_enum, 1, 0, audio_dsp_state_switch_texts); /* incall capture stream state */ -static const char *incall_capture_stream_texts[] = { "Off", "UL", "DL", "UL_DL" }; +static const char *incall_capture_stream_texts[] = { "Off", "UL", "DL", "UL_DL", "3MIC" }; static SOC_ENUM_SINGLE_DECL(incall_capture_stream0_enum, 1, 0, incall_capture_stream_texts); static SOC_ENUM_SINGLE_DECL(incall_capture_stream1_enum, 1, 1, incall_capture_stream_texts); static SOC_ENUM_SINGLE_DECL(incall_capture_stream2_enum, 1, 2, incall_capture_stream_texts); diff --git a/alsa/aoc_alsa_path.c b/alsa/aoc_alsa_path.c index 8309098..d2f8d86 100644 --- a/alsa/aoc_alsa_path.c +++ b/alsa/aoc_alsa_path.c @@ -484,7 +484,7 @@ static struct snd_soc_dai_driver aoc_dai_drv[] = { SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE, .channels_min = 1, - .channels_max = 4, + .channels_max = 8, }, .name = "audio_incall_cap_0", .id = IDX_INCALL_CAP0_TX, @@ -498,7 +498,7 @@ static struct snd_soc_dai_driver aoc_dai_drv[] = { SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE, .channels_min = 1, - .channels_max = 4, + .channels_max = 8, }, .name = "audio_incall_cap_1", .id = IDX_INCALL_CAP1_TX, @@ -512,7 +512,7 @@ static struct snd_soc_dai_driver aoc_dai_drv[] = { SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE, .channels_min = 1, - .channels_max = 4, + .channels_max = 8, }, .name = "audio_incall_cap_2", .id = IDX_INCALL_CAP2_TX, |