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

Commit 8c174167 authored by Dhanalakshmi Siddani's avatar Dhanalakshmi Siddani Committed by Gerrit - the friendly Code Review server
Browse files

asoc: Update max channels for TDM ports 



Update max channels supported for TDM ports from 8 to 16.
Update pcm driver to support 32 channels and 32bit format.

Change-Id: I3d3b42983fff22e0102b9eb2aaca1a5698820605
Signed-off-by: default avatarDhanalakshmi Siddani <dsiddani@codeaurora.org>
parent 96eca370

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+94 −90
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1358,12 +1358,18 @@ static int msm_dai_q6_prepare(struct snd_pcm_substream *substream, 
		if (dai_data->enc_config.format != ENC_FMT_NONE) {

			int bitwidth = 0;



			if (dai_data->afe_in_bitformat ==

			    SNDRV_PCM_FORMAT_S24_LE)

			switch (dai_data->afe_in_bitformat) {

			case SNDRV_PCM_FORMAT_S32_LE:

				bitwidth = 32;

				break;

			case SNDRV_PCM_FORMAT_S24_LE:

				bitwidth = 24;

			else if (dai_data->afe_in_bitformat ==

				 SNDRV_PCM_FORMAT_S16_LE)

				break;

			case SNDRV_PCM_FORMAT_S16_LE:

			default:

				bitwidth = 16;

				break;

			}

			pr_debug("%s: calling AFE_PORT_START_V2 with enc_format: %d\n",

				 __func__, dai_data->enc_config.format);

			rc = afe_port_start_v2(dai->id, &dai_data->port_config,
@@ -2185,6 +2191,9 @@ static int msm_dai_q6_afe_input_bit_format_get( 
	}



	switch (dai_data->afe_in_bitformat) {

	case SNDRV_PCM_FORMAT_S32_LE:

		ucontrol->value.integer.value[0] = 2;

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

		ucontrol->value.integer.value[0] = 1;

		break;
@@ -2210,6 +2219,9 @@ static int msm_dai_q6_afe_input_bit_format_put( 
		return -EINVAL;

	}

	switch (ucontrol->value.integer.value[0]) {

	case 2:

		dai_data->afe_in_bitformat = SNDRV_PCM_FORMAT_S32_LE;

		break;

	case 1:

		dai_data->afe_in_bitformat = SNDRV_PCM_FORMAT_S24_LE;

		break;
@@ -6079,11 +6091,17 @@ static int msm_dai_q6_tdm_set_tdm_slot(struct snd_soc_dai *dai, 
		return -EINVAL;

	}



	/* HW only supports 16 and 8 slots configuration */

	/* HW supports 1-32 slots configuration. Typical: 1, 2, 4, 8, 16, 32 */

	switch (slots) {

	case 1:

		cap_mask = 0x01;

		break;

	case 2:

		cap_mask = 0x03;

		break;

	case 4:

		cap_mask = 0x0F;

		break;

	case 8:

		cap_mask = 0xFF;

		break;
@@ -6187,27 +6205,13 @@ static int msm_dai_q6_tdm_set_sysclk(struct snd_soc_dai *dai, 
	struct msm_dai_q6_tdm_dai_data *dai_data =

		dev_get_drvdata(dai->dev);



	switch (dai->id) {

	case AFE_PORT_ID_PRIMARY_TDM_RX:

	case AFE_PORT_ID_PRIMARY_TDM_RX_1:

	case AFE_PORT_ID_PRIMARY_TDM_RX_2:

	case AFE_PORT_ID_PRIMARY_TDM_RX_3:

	case AFE_PORT_ID_PRIMARY_TDM_RX_4:

	case AFE_PORT_ID_PRIMARY_TDM_RX_5:

	case AFE_PORT_ID_PRIMARY_TDM_RX_6:

	case AFE_PORT_ID_PRIMARY_TDM_RX_7:

	case AFE_PORT_ID_PRIMARY_TDM_TX:

	case AFE_PORT_ID_PRIMARY_TDM_TX_1:

	case AFE_PORT_ID_PRIMARY_TDM_TX_2:

	case AFE_PORT_ID_PRIMARY_TDM_TX_3:

	case AFE_PORT_ID_PRIMARY_TDM_TX_4:

	case AFE_PORT_ID_PRIMARY_TDM_TX_5:

	case AFE_PORT_ID_PRIMARY_TDM_TX_6:

	case AFE_PORT_ID_PRIMARY_TDM_TX_7:

	if ((dai->id >= AFE_PORT_ID_PRIMARY_TDM_RX) &&

		(dai->id <= AFE_PORT_ID_QUATERNARY_TDM_TX_7)) {

		dai_data->clk_set.clk_freq_in_hz = freq;

		break;

	default:

		return 0;

	} else {

		dev_err(dai->dev, "%s: invalid dai id 0x%x\n",

			__func__, dai->id);

		return -EINVAL;

	}



	dev_dbg(dai->dev, "%s: dai id = 0x%x group clk_freq %d\n",
@@ -6771,7 +6775,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6791,7 +6795,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6811,7 +6815,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6831,7 +6835,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6851,7 +6855,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6871,7 +6875,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6891,7 +6895,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6911,7 +6915,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6931,7 +6935,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6951,7 +6955,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6971,7 +6975,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -6991,7 +6995,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7011,7 +7015,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7031,7 +7035,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7051,7 +7055,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7071,7 +7075,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7091,7 +7095,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7111,7 +7115,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7131,7 +7135,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7151,7 +7155,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7171,7 +7175,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7191,7 +7195,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7211,7 +7215,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7231,7 +7235,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7251,7 +7255,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7271,7 +7275,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7291,7 +7295,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7311,7 +7315,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7331,7 +7335,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7351,7 +7355,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7371,7 +7375,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7391,7 +7395,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7411,7 +7415,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7431,7 +7435,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7451,7 +7455,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7471,7 +7475,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7491,7 +7495,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7511,7 +7515,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7531,7 +7535,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7551,7 +7555,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7571,7 +7575,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7591,7 +7595,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7611,7 +7615,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7631,7 +7635,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7651,7 +7655,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7671,7 +7675,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7691,7 +7695,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7711,7 +7715,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7731,7 +7735,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7751,7 +7755,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7771,7 +7775,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7791,7 +7795,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7811,7 +7815,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7831,7 +7835,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7851,7 +7855,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7871,7 +7875,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7891,7 +7895,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7911,7 +7915,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7931,7 +7935,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7951,7 +7955,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7971,7 +7975,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -7991,7 +7995,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -8011,7 +8015,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},
@@ -8031,7 +8035,7 @@ static struct snd_soc_dai_driver msm_dai_q6_tdm_dai[] = { 
				   SNDRV_PCM_FMTBIT_S24_LE |

				   SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 16,

			.rate_min = 8000,

			.rate_max = 352800,

		},

sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c

+7 −7
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ static int msm_pcm_chmap_ctl_put(struct snd_kcontrol *kcontrol, 
	prtd = substream->runtime->private_data;

	if (prtd) {

		prtd->set_channel_map = true;

			for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL; i++)

			for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V2; i++)

				prtd->channel_map[i] =

				(char)(ucontrol->value.integer.value[i]);

	}
@@ -1556,11 +1556,11 @@ static int msm_pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol, 
	prtd = substream->runtime->private_data;



	if (prtd && prtd->set_channel_map == true) {

		for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL; i++)

		for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V2; i++)

			ucontrol->value.integer.value[i] =

					(int)prtd->channel_map[i];

	} else {

		for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL; i++)

		for (i = 0; i < PCM_FORMAT_MAX_NUM_CHANNEL_V2; i++)

			ucontrol->value.integer.value[i] = 0;

	}
@@ -1578,7 +1578,7 @@ static int msm_pcm_add_chmap_controls(struct snd_soc_pcm_runtime *rtd) 
	pr_debug("%s, Channel map cntrl add\n", __func__);

	ret = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,

				     snd_pcm_std_chmaps,

				     PCM_FORMAT_MAX_NUM_CHANNEL, 0,

				     PCM_FORMAT_MAX_NUM_CHANNEL_V2, 0,

				     &chmap_info);

	if (ret < 0) {

		pr_err("%s, channel map cntrl add failed\n", __func__);
@@ -2443,7 +2443,7 @@ static int msm_pcm_channel_mixer_output_map_info(struct snd_kcontrol *kcontrol, 
				       struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 32;

	uinfo->count = PCM_FORMAT_MAX_NUM_CHANNEL_V2;

	uinfo->value.integer.min = 1;

	uinfo->value.integer.max = 64;

	return 0;
@@ -2545,7 +2545,7 @@ static int msm_pcm_channel_mixer_input_map_info(struct snd_kcontrol *kcontrol, 
				       struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 32;

	uinfo->count = PCM_FORMAT_MAX_NUM_CHANNEL_V2;

	uinfo->value.integer.min = 1;

	uinfo->value.integer.max = 64;

	return 0;
@@ -2760,7 +2760,7 @@ static int msm_pcm_channel_mixer_weight_info(struct snd_kcontrol *kcontrol, 
				       struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 32;

	uinfo->count = PCM_FORMAT_MAX_NUM_CHANNEL_V2;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = 0x4000;

	return 0;