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

Commit deceaf9e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: QCS405: Additional TDM samplerates and channels"

parents ea098207 546d4fc9

asoc/msm-dai-q6-v2.c

+17 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

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

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

 */



#include <linux/init.h>
@@ -12034,7 +12034,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,

		},
@@ -12055,7 +12055,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,

		},
@@ -12076,7 +12076,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,

		},
@@ -12097,7 +12097,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,

		},
@@ -12118,7 +12118,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,

		},
@@ -12139,7 +12139,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,

		},
@@ -12160,7 +12160,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,

		},
@@ -12181,7 +12181,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,

		},
@@ -12202,7 +12202,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,

		},
@@ -12223,7 +12223,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,

		},
@@ -12244,7 +12244,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,

		},
@@ -12265,7 +12265,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,

		},
@@ -12286,7 +12286,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,

		},
@@ -12307,7 +12307,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,

		},
@@ -12328,7 +12328,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,

		},
@@ -12349,7 +12349,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,

		},

asoc/msm-pcm-routing-v2.c

+290 −0

File changed.

Preview size limit exceeded, changes collapsed.

asoc/qcs405.c

+649 −41

File changed.

Preview size limit exceeded, changes collapsed.

dsp/q6afe.c

+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ static struct afe_clkinfo_per_port clkinfo_per_port[] = { 
		MCLK_SRC_INT, Q6AFE_EXT_MCLK_FREQ_DEFAULT, ""},

	{ AFE_PORT_ID_QUINARY_TDM_RX,

		MCLK_SRC_INT, Q6AFE_EXT_MCLK_FREQ_DEFAULT, ""},

	{ AFE_PORT_ID_SENARY_TDM_RX,

		MCLK_SRC_INT, Q6AFE_EXT_MCLK_FREQ_DEFAULT, ""},

	{ AFE_PORT_ID_PRIMARY_SPDIF_RX,

		MCLK_SRC_INT, Q6AFE_EXT_MCLK_FREQ_DEFAULT, ""},

	{ AFE_PORT_ID_PRIMARY_SPDIF_TX,