Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67586ab5 authored by Honghao Liu's avatar Honghao Liu
Browse files

ASoC: msm: add TDM slot and channel config in APQ8096 machine driver 



Add TDM slot and channel configuration in APQ8096 machine driver. Add
support of Agave and MMXF sound card.

Change-Id: Ib3dec8263911a36c915c97b02be3428c7900ce65
Signed-off-by: default avatarHonghao Liu <honghaol@codeaurora.org>
parent a453ed84

sound/soc/msm/apq8096-auto.c

+516 −42
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ 
#define SAMPLING_RATE_96KHZ     96000

#define SAMPLING_RATE_192KHZ    192000



static struct platform_device *spdev;



static int hdmi_rx_bit_format = SNDRV_PCM_FORMAT_S16_LE;

static int msm_auxpcm_rate = SAMPLING_RATE_8KHZ;

static int msm_hdmi_rx_ch = 2;
@@ -75,6 +73,132 @@ static int msm_quat_tdm_tx_1_ch = 2; 
static int msm_quat_tdm_tx_2_ch = 2;

static int msm_quat_tdm_tx_3_ch = 1;



enum {

	QUATERNARY_TDM_RX_0,

	QUATERNARY_TDM_RX_1,

	QUATERNARY_TDM_RX_2,

	QUATERNARY_TDM_RX_3,

	QUATERNARY_TDM_RX_4,

	QUATERNARY_TDM_RX_5,

	QUATERNARY_TDM_RX_6,

	QUATERNARY_TDM_RX_7,

	QUATERNARY_TDM_TX_0,

	QUATERNARY_TDM_TX_1,

	QUATERNARY_TDM_TX_2,

	QUATERNARY_TDM_TX_3,

	QUATERNARY_TDM_TX_4,

	QUATERNARY_TDM_TX_5,

	QUATERNARY_TDM_TX_6,

	QUATERNARY_TDM_TX_7,

	TERTIARY_TDM_RX_0,

	TERTIARY_TDM_RX_1,

	TERTIARY_TDM_RX_2,

	TERTIARY_TDM_RX_3,

	TERTIARY_TDM_RX_4,

	TERTIARY_TDM_RX_5,

	TERTIARY_TDM_RX_6,

	TERTIARY_TDM_RX_7,

	TERTIARY_TDM_TX_0,

	TERTIARY_TDM_TX_1,

	TERTIARY_TDM_TX_2,

	TERTIARY_TDM_TX_3,

	TERTIARY_TDM_TX_4,

	TERTIARY_TDM_TX_5,

	TERTIARY_TDM_TX_6,

	TERTIARY_TDM_TX_7,

	TDM_MAX,

};



#define TDM_SLOT_OFFSET_MAX    8



/* TDM default offset */

static unsigned int tdm_slot_offset[TDM_MAX][TDM_SLOT_OFFSET_MAX] = {

	/* QUAT_TDM_RX */

	{0, 4, 8, 12, 16, 20, 0xFFFF},

	{24, 0xFFFF},

	{28, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	/* QUAT_TDM_TX */

	{0, 4, 8, 12, 0xFFFF},

	{16, 20, 0xFFFF},

	{24, 28, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	/* TERT_TDM_RX */

	{0, 4, 8, 12, 16, 20, 0xFFFF},

	{24, 0xFFFF},

	{28, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	/* TERT_TDM_TX */

	{0, 4, 8, 12, 0xFFFF},

	{16, 20, 0xFFFF},

	{24, 28, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

};





/***************************************************************************

* Codec/Platform specific tdm slot offset table

* NOTE:

*     each entry represents the slot offset array of one backend tdm device

*     valid offset represents the starting offset in byte for the channel

*     use 0xFFFF for end or unused slot offset entry

***************************************************************************/

static unsigned int tdm_slot_offset_adp_mmxf[TDM_MAX][TDM_SLOT_OFFSET_MAX] = {

	/* QUAT_TDM_RX */

	{2, 5, 8, 11, 14, 17, 20, 23},

	{26, 0xFFFF},

	{28, 0xFFFF},

	{30, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	/* QUAT_TDM_TX */

	{2, 0xFFFF},

	{10, 0xFFFF},

	{20, 22, 26, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	/* TERT_TDM_RX */

	{2, 5, 8, 11, 14, 17, 20, 23},

	{26, 0xFFFF},

	{28, 0xFFFF},

	{30, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	/* TERT_TDM_TX */

	{2, 0xFFFF},

	{10, 0xFFFF},

	{20, 22, 26, 0xFFFF},

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

	{0xFFFF}, /* not used */

};





static char const *hdmi_rx_ch_text[] = {"Two", "Three", "Four", "Five",

					"Six", "Seven", "Eight"};

static char const *rx_bit_format_text[] = {"S16_LE", "S24_LE"};
@@ -107,10 +231,6 @@ static struct afe_clk_set mi2s_rx_clk = { 
	0,

};



struct apq8096_asoc_mach_data {

	struct snd_info_entry *codec_root;

};



static inline int param_is_mask(int p)

{

	return (p >= SNDRV_PCM_HW_PARAM_FIRST_MASK) &&
@@ -844,6 +964,233 @@ static struct snd_soc_ops apq8096_mi2s_be_ops = { 
	.shutdown = apq8096_mi2s_snd_shutdown,

};



static unsigned int tdm_param_set_slot_mask(u16 port_id,

				int slot_width, int slots)

{

	unsigned int slot_mask = 0;

	int upper, lower, i, j;

	unsigned int *slot_offset;



	switch (port_id) {

	case AFE_PORT_ID_TERTIARY_TDM_RX:

	case AFE_PORT_ID_TERTIARY_TDM_RX_1:

	case AFE_PORT_ID_TERTIARY_TDM_RX_2:

	case AFE_PORT_ID_TERTIARY_TDM_RX_3:

		lower = TERTIARY_TDM_RX_0;

		upper = TERTIARY_TDM_RX_3;

		break;

	case AFE_PORT_ID_TERTIARY_TDM_TX:

	case AFE_PORT_ID_TERTIARY_TDM_TX_1:

	case AFE_PORT_ID_TERTIARY_TDM_TX_2:

	case AFE_PORT_ID_TERTIARY_TDM_TX_3:

		lower = TERTIARY_TDM_TX_0;

		upper = TERTIARY_TDM_TX_3;

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_RX:

	case AFE_PORT_ID_QUATERNARY_TDM_RX_1:

	case AFE_PORT_ID_QUATERNARY_TDM_RX_2:

	case AFE_PORT_ID_QUATERNARY_TDM_RX_3:

		lower = QUATERNARY_TDM_RX_0;

		upper = QUATERNARY_TDM_RX_3;

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_TX:

	case AFE_PORT_ID_QUATERNARY_TDM_TX_1:

	case AFE_PORT_ID_QUATERNARY_TDM_TX_2:

	case AFE_PORT_ID_QUATERNARY_TDM_TX_3:

		lower = QUATERNARY_TDM_TX_0;

		upper = QUATERNARY_TDM_TX_3;

		break;

	default:

		return slot_mask;

	}



	for (i = lower; i <= upper; i++) {

		slot_offset = tdm_slot_offset[i];

		for (j = 0; j < TDM_SLOT_OFFSET_MAX; j++) {

			if (slot_offset[j] != AFE_SLOT_MAPPING_OFFSET_INVALID)

				/*

				 * set the mask of active slot according to

				 * the offset table for the group of devices

				 */

				slot_mask |=

				    (1 << ((slot_offset[j] * 8) / slot_width));

			else

				break;

		}

	}



	return slot_mask;

}



static int apq8096_tdm_snd_hw_params(struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	int ret = 0;

	int channels, slot_width, slots;

	unsigned int slot_mask;

	unsigned int *slot_offset;

	int offset_channels = 0;

	int i;



	pr_debug("%s: dai id = 0x%x\n", __func__, cpu_dai->id);



	channels = params_channels(params);

	switch (channels) {

	case 1:

	case 2:

	case 3:

	case 4:

	case 6:

	case 8:

		switch (params_format(params)) {

		case SNDRV_PCM_FORMAT_S32_LE:

		case SNDRV_PCM_FORMAT_S24_LE:

		case SNDRV_PCM_FORMAT_S16_LE:

			/*

			 * up to 8 channel HW configuration should

			 * use 32 bit slot width for max support of

			 * stream bit width. (slot_width > bit_width)

			 */

			slot_width = 32;

			break;

		default:

			pr_err("%s: invalid param format 0x%x\n",

				__func__, params_format(params));

			return -EINVAL;

		}

		slots = 8;

		slot_mask = tdm_param_set_slot_mask(cpu_dai->id,

			slot_width, slots);

		if (!slot_mask) {

			pr_err("%s: invalid slot_mask 0x%x\n",

				__func__, slot_mask);

			return -EINVAL;

		}

		break;

	default:

		pr_err("%s: invalid param channels %d\n",

			__func__, channels);

		return -EINVAL;

	}



	switch (cpu_dai->id) {

	case AFE_PORT_ID_TERTIARY_TDM_RX:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_RX_0];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_RX_1:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_RX_1];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_RX_2:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_RX_2];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_RX_3:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_RX_3];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_TX:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_TX_0];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_TX_1:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_TX_1];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_TX_2:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_TX_2];

		break;

	case AFE_PORT_ID_TERTIARY_TDM_TX_3:

		slot_offset = tdm_slot_offset[TERTIARY_TDM_TX_3];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_RX:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_RX_0];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_RX_1:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_RX_1];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_RX_2:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_RX_2];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_RX_3:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_RX_3];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_TX:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_TX_0];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_TX_1:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_TX_1];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_TX_2:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_TX_2];

		break;

	case AFE_PORT_ID_QUATERNARY_TDM_TX_3:

		slot_offset = tdm_slot_offset[QUATERNARY_TDM_TX_3];

		break;

	default:

		pr_err("%s: dai id 0x%x not supported\n",

			__func__, cpu_dai->id);

		return -EINVAL;

	}



	for (i = 0; i < TDM_SLOT_OFFSET_MAX; i++) {

		if (slot_offset[i] != AFE_SLOT_MAPPING_OFFSET_INVALID)

			offset_channels++;

		else

			break;

	}



	if (offset_channels == 0) {

		pr_err("%s: slot offset not supported, offset_channels %d\n",

			__func__, offset_channels);

		return -EINVAL;

	}



	if (channels > offset_channels) {

		pr_err("%s: channels %d exceed offset_channels %d\n",

			__func__, channels, offset_channels);

		return -EINVAL;

	}



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0, slot_mask,

			slots, slot_width);

		if (ret < 0) {

			pr_err("%s: failed to set tdm slot, err:%d\n",

				__func__, ret);

			goto end;

		}



		ret = snd_soc_dai_set_channel_map(cpu_dai,

			0, NULL, channels, slot_offset);

		if (ret < 0) {

			pr_err("%s: failed to set channel map, err:%d\n",

				__func__, ret);

			goto end;

		}

	} else {

		ret = snd_soc_dai_set_tdm_slot(cpu_dai, slot_mask, 0,

			slots, slot_width);

		if (ret < 0) {

			pr_err("%s: failed to set tdm slot, err:%d\n",

				__func__, ret);

			goto end;

		}



		ret = snd_soc_dai_set_channel_map(cpu_dai,

			channels, slot_offset, 0, NULL);

		if (ret < 0) {

			pr_err("%s: failed to set channel map, err:%d\n",

				__func__, ret);

			goto end;

		}

	}



end:

	return ret;

}



static struct snd_soc_ops apq8096_tdm_be_ops = {

	.hw_params = apq8096_tdm_snd_hw_params,

};



static const struct soc_enum msm_snd_enum[] = {

	SOC_ENUM_SINGLE_EXT(2, auxpcm_rate_text),

	SOC_ENUM_SINGLE_EXT(7, hdmi_rx_ch_text),
@@ -1014,6 +1361,23 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = { 
		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA3,

	},

	/* Hostless PCM purpose */

	{

		.name = "SLIMBUS_0 Hostless",

		.stream_name = "SLIMBUS_0 Hostless",

		.cpu_dai_name = "SLIMBUS0_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		 /* this dailink has playback support */

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "Tertiary MI2S TX_Hostless",

		.stream_name = "Tertiary MI2S_TX Hostless Capture",
@@ -1084,6 +1448,57 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "SLIMBUS_1 Hostless",

		.stream_name = "SLIMBUS_1 Hostless",

		.cpu_dai_name = "SLIMBUS1_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		 /* this dailink has playback support */

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "SLIMBUS_3 Hostless",

		.stream_name = "SLIMBUS_3 Hostless",

		.cpu_dai_name = "SLIMBUS3_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		 /* this dailink has playback support */

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "SLIMBUS_4 Hostless",

		.stream_name = "SLIMBUS_4 Hostless",

		.cpu_dai_name = "SLIMBUS4_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		 /* this dailink has playback support */

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "VoLTE",

		.stream_name = "VoLTE",
@@ -1955,6 +2370,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_RX_0,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -1968,6 +2384,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_RX_1,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -1981,6 +2398,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_RX_2,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -1994,6 +2412,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_RX_3,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2007,6 +2426,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_TX_0,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2020,6 +2440,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_TX_1,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2033,6 +2454,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_TX_2,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2046,6 +2468,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_TERT_TDM_TX_3,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2059,6 +2482,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_RX_0,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2072,6 +2496,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_RX_1,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2085,6 +2510,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_RX_2,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2098,6 +2524,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_RX_3,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2111,6 +2538,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_TX_0,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2124,6 +2552,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_TX_1,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2137,6 +2566,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_TX_2,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

	{
@@ -2150,6 +2580,7 @@ static struct snd_soc_dai_link apq8096_auto_be_dai_links[] = { 
		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_QUAT_TDM_TX_3,

		.be_hw_params_fixup = msm_tdm_be_hw_params_fixup,

		.ops = &apq8096_tdm_be_ops,

		.ignore_suspend = 1,

	},

};
@@ -2183,6 +2614,14 @@ struct snd_soc_card snd_soc_card_auto_apq8096 = { 
	.name = "apq8096-auto-snd-card",

};



struct snd_soc_card snd_soc_card_adp_agave_apq8096 = {

	.name = "apq8096-adp-agave-snd-card",

};



struct snd_soc_card snd_soc_card_adp_mmxf_apq8096 = {

	.name = "apq8096-adp-mmxf-snd-card",

};



static int apq8096_populate_dai_link_component_of_node(

					struct snd_soc_card *card)

{
@@ -2272,6 +2711,10 @@ err: 
static const struct of_device_id apq8096_asoc_machine_of_match[]  = {

	{ .compatible = "qcom,apq8096-asoc-snd-auto",

	  .data = "auto_codec"},

	{ .compatible = "qcom,apq8096-asoc-snd-adp-agave",

	  .data = "adp_agave_codec"},

	{ .compatible = "qcom,apq8096-asoc-snd-adp-mmxf",

	  .data = "adp_mmxf_codec"},

	{},

};
@@ -2289,8 +2732,19 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
		return NULL;

	}



	if (!strcmp(match->data, "auto_codec")) {

	if (!strcmp(match->data, "auto_codec"))

		card = &snd_soc_card_auto_apq8096;

	else if (!strcmp(match->data, "adp_agave_codec"))

		card = &snd_soc_card_adp_agave_apq8096;

	else if (!strcmp(match->data, "adp_mmxf_codec"))

		card = &snd_soc_card_adp_mmxf_apq8096;

	else {

		dev_err(dev, "%s: Codec not supported\n",

			__func__);

		return NULL;

	}



	/* same FE and BE used for all codec */

	len_1 = ARRAY_SIZE(apq8096_common_dai_links);

	len_2 = len_1 + ARRAY_SIZE(apq8096_auto_fe_dai_links);

	len_3 = len_2 + ARRAY_SIZE(apq8096_common_be_dai_links);
@@ -2310,7 +2764,6 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 


	dailink = apq8096_auto_dai_links;

	len_4 = len_3 + ARRAY_SIZE(apq8096_auto_be_dai_links);

	}



	if (of_property_read_bool(dev->of_node, "qcom,hdmi-audio-rx")) {

		dev_dbg(dev, "%s(): hdmi audio support present\n",
@@ -2330,10 +2783,36 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
	return card;

}



/*

 * TDM offset mapping is per platform/codec specific.

 * TO BE UPDATED if new platform/codec is introduced.

 */

static int apq8096_init_tdm_dev(struct device *dev)

{

	const struct of_device_id *match;



	match = of_match_node(apq8096_asoc_machine_of_match, dev->of_node);

	if (!match) {

		dev_err(dev, "%s: No DT match found for sound card\n",

			__func__);

		return -EINVAL;

	}



	if (!strcmp(match->data, "adp_mmxf_codec")) {

		dev_dbg(dev, "%s: ADP MMXF tdm slot offset\n", __func__);

		memcpy(tdm_slot_offset,

			tdm_slot_offset_adp_mmxf,

			sizeof(tdm_slot_offset_adp_mmxf));

	} else {

		dev_dbg(dev, "%s: DEFAULT tdm slot offset\n", __func__);

	}



	return 0;

}



static int apq8096_asoc_machine_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card;

	struct apq8096_asoc_mach_data *pdata;

	const struct of_device_id *match;

	int ret;
@@ -2342,14 +2821,6 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	pdata = devm_kzalloc(&pdev->dev,

			sizeof(struct apq8096_asoc_mach_data), GFP_KERNEL);

	if (!pdata) {

		ret = -ENOMEM;

		dev_err(&pdev->dev, "Can't allocate apq8096_asoc_mach_data\n");

		return ret;

	}



	card = populate_snd_card_dailinks(&pdev->dev);

	if (!card) {

		dev_err(&pdev->dev, "%s: Card uninitialized\n", __func__);
@@ -2358,11 +2829,10 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev) 
	}

	card->dev = &pdev->dev;

	platform_set_drvdata(pdev, card);

	snd_soc_card_set_drvdata(card, pdata);



	ret = snd_soc_of_parse_card_name(card, "qcom,model");

	if (ret) {

		dev_err(&pdev->dev, "parse card name failed, err:%d\n",

		dev_err(&pdev->dev, "Parse card name failed, err:%d\n",

			ret);

		goto err;

	}
@@ -2370,13 +2840,11 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev) 
	match = of_match_node(apq8096_asoc_machine_of_match,

			pdev->dev.of_node);

	if (!match) {

		dev_err(&pdev->dev, "%s: no matched codec is found.\n",

		dev_err(&pdev->dev, "%s: No matched codec is found.\n",

			__func__);

		goto err;

	}



	spdev = pdev;



	ret = apq8096_populate_dai_link_component_of_node(card);

	if (ret) {

		ret = -EPROBE_DEFER;
@@ -2387,6 +2855,12 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev) 
	card->controls = msm_snd_controls;

	card->num_controls = ARRAY_SIZE(msm_snd_controls);



	ret = apq8096_init_tdm_dev(&pdev->dev);

	if (ret) {

		ret = -EPROBE_DEFER;

		goto err;

	}



	ret = snd_soc_register_card(card);

	if (ret == -EPROBE_DEFER) {

		goto err;
@@ -2398,8 +2872,8 @@ static int apq8096_asoc_machine_probe(struct platform_device *pdev) 
	dev_info(&pdev->dev, "Sound card %s registered\n", card->name);



	return 0;



err:

	devm_kfree(&pdev->dev, pdata);

	return ret;

}