Unverified Commit 4dddbddb authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: qdsp6: q6common: Add qdsp6 helper functions 



This patch adds some common helper functions like translating dsp error
to linux error codes and channel mappings etc.

These functions are used in all the following qdsp6 drivers.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-and-tested-by: default avatarRohit kumar <rohitkr@codeaurora.org>
Reviewed-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0e17e982

sound/soc/qcom/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -40,3 +40,16 @@ config SND_SOC_APQ8016_SBC 
          Support for Qualcomm Technologies LPASS audio block in

          APQ8016 SOC-based systems.

          Say Y if you want to use audio devices on MI2S.



config SND_SOC_QDSP6_COMMON

	tristate



config SND_SOC_QDSP6

	tristate "SoC ALSA audio driver for QDSP6"

	depends on QCOM_APR && HAS_DMA

	select SND_SOC_QDSP6_COMMON

	help

	 To add support for MSM QDSP6 Soc Audio.

	 This will enable sound soc platform specific

	 audio drivers. This includes q6asm, q6adm,

	 q6afe interfaces to DSP using apr.

sound/soc/qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -16,3 +16,6 @@ snd-soc-apq8016-sbc-objs := apq8016_sbc.o 


obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o

obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o



#DSP lib

obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/

sound/soc/qcom/qdsp6/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SND_SOC_QDSP6_COMMON) += q6dsp-common.o

sound/soc/qcom/qdsp6/q6dsp-common.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

// Copyright (c) 2018, Linaro Limited



#include "q6dsp-common.h"

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/errno.h>



int q6dsp_map_channels(u8 ch_map[PCM_MAX_NUM_CHANNEL], int ch)

{

	memset(ch_map, 0, PCM_MAX_NUM_CHANNEL);



	switch (ch) {

	case 1:

		ch_map[0] = PCM_CHANNEL_FC;

		break;

	case 2:

		ch_map[0] = PCM_CHANNEL_FL;

		ch_map[1] = PCM_CHANNEL_FR;

		break;

	case 3:

		ch_map[0] = PCM_CHANNEL_FL;

		ch_map[1] = PCM_CHANNEL_FR;

		ch_map[2] = PCM_CHANNEL_FC;

		break;

	case 4:

		ch_map[0] = PCM_CHANNEL_FL;

		ch_map[1] = PCM_CHANNEL_FR;

		ch_map[2] = PCM_CHANNEL_LS;

		ch_map[3] = PCM_CHANNEL_RS;

		break;

	case 5:

		ch_map[0] = PCM_CHANNEL_FL;

		ch_map[1] = PCM_CHANNEL_FR;

		ch_map[2] = PCM_CHANNEL_FC;

		ch_map[3] = PCM_CHANNEL_LS;

		ch_map[4] = PCM_CHANNEL_RS;

		break;

	case 6:

		ch_map[0] = PCM_CHANNEL_FL;

		ch_map[1] = PCM_CHANNEL_FR;

		ch_map[2] = PCM_CHANNEL_LFE;

		ch_map[3] = PCM_CHANNEL_FC;

		ch_map[4] = PCM_CHANNEL_LS;

		ch_map[5] = PCM_CHANNEL_RS;

		break;

	case 8:

		ch_map[0] = PCM_CHANNEL_FL;

		ch_map[1] = PCM_CHANNEL_FR;

		ch_map[2] = PCM_CHANNEL_LFE;

		ch_map[3] = PCM_CHANNEL_FC;

		ch_map[4] = PCM_CHANNEL_LS;

		ch_map[5] = PCM_CHANNEL_RS;

		ch_map[6] = PCM_CHANNEL_LB;

		ch_map[7] = PCM_CHANNEL_RB;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(q6dsp_map_channels);

MODULE_LICENSE("GPL v2");

sound/soc/qcom/qdsp6/q6dsp-common.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef __Q6DSP_COMMON_H__

#define __Q6DSP_COMMON_H__



#include <linux/kernel.h>



#define PCM_MAX_NUM_CHANNEL  8

#define PCM_CHANNEL_NULL 0



#define PCM_CHANNEL_FL    1	/* Front left channel. */

#define PCM_CHANNEL_FR    2	/* Front right channel. */

#define PCM_CHANNEL_FC    3	/* Front center channel. */

#define PCM_CHANNEL_LS   4	/* Left surround channel. */

#define PCM_CHANNEL_RS   5	/* Right surround channel. */

#define PCM_CHANNEL_LFE  6	/* Low frequency effect channel. */

#define PCM_CHANNEL_CS   7	/* Center surround channel; Rear center ch */

#define PCM_CHANNEL_LB   8	/* Left back channel; Rear left channel. */

#define PCM_CHANNEL_RB   9	/* Right back channel; Rear right channel. */

#define PCM_CHANNELS   10	/* Top surround channel. */



int q6dsp_map_channels(u8 ch_map[PCM_MAX_NUM_CHANNEL], int ch);



#endif /* __Q6DSP_COMMON_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE