diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-11-30 19:07:57 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2023-12-11 12:54:09 +0000 |
| commit | bcd684eae5aefc0688fcf43fd555155dd57f27c9 (patch) | |
| tree | 1126e8d3e0e66a761879071b6c73435536d3f847 /sound/soc/qcom | |
| parent | ASoC: qcom: audioreach: Commonize setting channel mappings (diff) | |
| download | wireguard-linux-bcd684eae5aefc0688fcf43fd555155dd57f27c9.tar.xz wireguard-linux-bcd684eae5aefc0688fcf43fd555155dd57f27c9.zip | |
ASoC: qcom: audioreach: drop duplicate channel defines
q6apm.h header already defines channel mapping values, so drop
duplicated devices from audioreach.h.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20231130180758.212172-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/qcom')
| -rw-r--r-- | sound/soc/qcom/qdsp6/audioreach.c | 12 | ||||
| -rw-r--r-- | sound/soc/qcom/qdsp6/audioreach.h | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 3db5ff367a29..5c7113d46b6f 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -270,10 +270,10 @@ EXPORT_SYMBOL_GPL(audioreach_alloc_apm_cmd_pkt); static void audioreach_set_channel_mapping(u8 *ch_map, int num_channels) { if (num_channels == 1) { - ch_map[0] = PCM_CHANNEL_L; + ch_map[0] = PCM_CHANNEL_FL; } else if (num_channels == 2) { - ch_map[0] = PCM_CHANNEL_L; - ch_map[1] = PCM_CHANNEL_R; + ch_map[0] = PCM_CHANNEL_FL; + ch_map[1] = PCM_CHANNEL_FR; } } @@ -839,10 +839,10 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, media_format->num_channels = cfg->num_channels; if (num_channels == 1) { - media_format->channel_mapping[0] = PCM_CHANNEL_L; + media_format->channel_mapping[0] = PCM_CHANNEL_FL; } else if (num_channels == 2) { - media_format->channel_mapping[0] = PCM_CHANNEL_L; - media_format->channel_mapping[1] = PCM_CHANNEL_R; + media_format->channel_mapping[0] = PCM_CHANNEL_FL; + media_format->channel_mapping[1] = PCM_CHANNEL_FR; } rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audioreach.h index e38111ffd7b9..2c82917b7162 100644 --- a/sound/soc/qcom/qdsp6/audioreach.h +++ b/sound/soc/qcom/qdsp6/audioreach.h @@ -158,8 +158,6 @@ struct param_id_enc_bitrate_param { #define MEDIA_FMT_ID_PCM 0x09001000 #define MEDIA_FMT_ID_MP3 0x09001009 -#define PCM_CHANNEL_L 1 -#define PCM_CHANNEL_R 2 #define SAMPLE_RATE_48K 48000 #define BIT_WIDTH_16 16 |