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

Commit 483cb9aa authored by Patrick Lai's avatar Patrick Lai Committed by Banajit Goswami
Browse files

ASoC: msm: Update format of capture CPU DAIs to support 24-bits 



CPU DAIs defined in msm-dai-fe.c are just dummy CPU DAIS to meet
ASoC framework requirement that each DAI-ink must have CPU DAI.
Hence, there is no reason why capture CPU DAIs cannot support 24-bits.
Update format of all multimedia capture CPU DAIs to support 24-bits
For hostless DAIs representing physical audio interfaces which are
known to support 24 bitwidth, update as well.

Change-Id: I1b1e4139df440d556ba7cb8af4cbfa16c3e33479
Signed-off-by: default avatarPatrick Lai <plai@codeaurora.org>
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent 79f2f5ea

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

+29 −15
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, 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
@@ -130,7 +130,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL2",

			.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),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -227,7 +228,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL4",

			.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),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -256,7 +258,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL5",

			.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),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -284,7 +287,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL6",

			.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),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -330,7 +334,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.aif_name = "MM_UL8",

			.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),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -357,7 +362,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "SLIMBUS0_HOSTLESS Capture",

			.aif_name = "SLIM0_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_96000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,
@@ -383,7 +389,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "SLIMBUS1_HOSTLESS Capture",

			.aif_name = "SLIM1_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,
@@ -409,7 +416,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "SLIMBUS3_HOSTLESS Capture",

			.aif_name = "SLIM3_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,
@@ -435,7 +443,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "SLIMBUS4_HOSTLESS Capture",

			.aif_name = "SLIM4_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,
@@ -529,7 +538,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "HDMI_HOSTLESS Playback",

			.aif_name = "HDMI_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,
@@ -629,7 +639,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "MI2S_TX_HOSTLESS Capture",

			.aif_name = "MI2S_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,
@@ -659,7 +670,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "Primary MI2S_TX Hostless Capture",

			.aif_name = "PRI_MI2S_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,
@@ -689,7 +701,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "Tertiary MI2S_TX Hostless Capture",

			.aif_name = "TERT_MI2S_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,
@@ -719,7 +732,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.stream_name = "Quaternary MI2S_TX Hostless Capture",

			.aif_name = "QUAT_MI2S_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,