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

Commit a82caad5 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 c31ce208 702192ac

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>
@@ -11653,7 +11653,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,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+304 −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
@@ -300,6 +300,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,