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

Commit dfe94b0f authored by Surendar karka's avatar Surendar karka
Browse files

ASoC: msm: qdsp6v2: add 32bit capture support in dai driver 



Add support for 24/32 bit recording support in
FE and BE drivers.

CRs-Fixed: 2129947
Change-Id: I22c0a98b1d6b724762de70c683672ddeaf76eb1e
Signed-off-by: default avatarSurendar karka <sukark@codeaurora.org>
parent 18ff677c

sound/soc/msm/msm-dai-fe.c

+25 −11
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -140,7 +141,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -223,7 +225,9 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.rates = (SNDRV_PCM_RATE_8000_192000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -255,7 +259,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 0,

			.channels_max = 8,

			.rate_min =     8000,
@@ -288,7 +293,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -320,7 +326,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -372,7 +379,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -2118,7 +2126,10 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL9",

			.rates = (SNDRV_PCM_RATE_8000_48000|

				  SNDRV_PCM_RATE_KNOT),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -2513,7 +2524,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -2532,7 +2544,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -2551,7 +2564,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

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

+46 −18
Original line number Diff line number Diff line
@@ -3132,6 +3132,10 @@ static int msm_dai_q6_mi2s_hw_params(struct snd_pcm_substream *substream, 
		dai_data->port_config.i2s.bit_width = 24;

		dai_data->bitwidth = 24;

		break;

	case SNDRV_PCM_FORMAT_S32_LE:

		dai_data->port_config.i2s.bit_width = 32;

		dai_data->bitwidth = 32;

		break;

	default:

		pr_err("%s: format %d\n",

			__func__, params_format(params));
@@ -3290,10 +3294,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
			.stream_name = "Primary MI2S Capture",

			.aif_name = "PRI_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			SNDRV_PCM_RATE_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_PRIM_MI2S,
@@ -3315,10 +3323,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
			.stream_name = "Secondary MI2S Capture",

			.aif_name = "SEC_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			SNDRV_PCM_RATE_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_SEC_MI2S,
@@ -3339,10 +3351,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
			.stream_name = "Tertiary MI2S Capture",

			.aif_name = "TERT_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			SNDRV_PCM_RATE_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_TERT_MI2S,
@@ -3364,10 +3380,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
			.stream_name = "Quaternary MI2S Capture",

			.aif_name = "QUAT_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			SNDRV_PCM_RATE_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_QUAT_MI2S,
@@ -3401,10 +3421,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
			.stream_name = "Quinary MI2S Capture",

			.aif_name = "QUIN_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			SNDRV_PCM_RATE_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_QUIN_MI2S,
@@ -3416,10 +3440,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
			.stream_name = "Senary_mi2s Capture",

			.aif_name = "SENARY_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			SNDRV_PCM_RATE_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_SENARY_MI2S,

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

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ static int msm_routing_get_bit_width(unsigned int format) 
	int bit_width;















	switch (format) {













	case SNDRV_PCM_FORMAT_S32_LE:













		bit_width = 32;













		break;















	case SNDRV_PCM_FORMAT_S24_LE:















	case SNDRV_PCM_FORMAT_S24_3LE:















		bit_width = 24;