Unverified Commit bcd684ea authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20231130180758.212172-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ef14f40a

sound/soc/qcom/qdsp6/audioreach.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

sound/soc/qcom/qdsp6/audioreach.h

+0 −2
Original line number Diff line number Diff line
@@ -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