Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-08 14:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: jz4740-i2s: Add support for the JZ4770

Browse Source 
Before the JZ4770, the playback and capture sampling rates had to match.
The JZ4770 supports independent sampling rates for both.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200306222931.39664-6-paul@crapouillou.net
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Paul Cercueil 2020-03-06 23:29:31 +01:00 committed by Mark Brown
parent bde8ca7c87
commit a3434a497a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/jz4740/jz4740-i2s.c
View File

@ -87,6 +87,7 @@
enum jz47xx_i2s_version { enum jz47xx_i2s_version {
JZ_I2S_JZ4740, JZ_I2S_JZ4740,
JZ_I2S_JZ4760, JZ_I2S_JZ4760,
JZ_I2S_JZ4770,
JZ_I2S_JZ4780, JZ_I2S_JZ4780,
}; };
@ -286,7 +287,7 @@ static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream,
ctrl &= ~JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK; ctrl &= ~JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK;
ctrl |= sample_size << JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET; ctrl |= sample_size << JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET;
if (i2s->soc_info->version >= JZ_I2S_JZ4780) { if (i2s->soc_info->version >= JZ_I2S_JZ4770) {
div_reg &= ~I2SDIV_IDV_MASK; div_reg &= ~I2SDIV_IDV_MASK;
div_reg |= (div - 1) << I2SDIV_IDV_SHIFT; div_reg |= (div - 1) << I2SDIV_IDV_SHIFT;
} else { } else {
@ -469,7 +470,7 @@ static const struct i2s_soc_info jz4760_i2s_soc_info = {
.dai = &jz4740_i2s_dai, .dai = &jz4740_i2s_dai,
}; };
static struct snd_soc_dai_driver jz4780_i2s_dai = { static struct snd_soc_dai_driver jz4770_i2s_dai = {
.probe = jz4740_i2s_dai_probe, .probe = jz4740_i2s_dai_probe,
.remove = jz4740_i2s_dai_remove, .remove = jz4740_i2s_dai_remove,
.playback = { .playback = {
@ -487,9 +488,14 @@ static struct snd_soc_dai_driver jz4780_i2s_dai = {
.ops = &jz4740_i2s_dai_ops, .ops = &jz4740_i2s_dai_ops,
}; };
static const struct i2s_soc_info jz4770_i2s_soc_info = {
.version = JZ_I2S_JZ4770,
.dai = &jz4770_i2s_dai,
};
static const struct i2s_soc_info jz4780_i2s_soc_info = { static const struct i2s_soc_info jz4780_i2s_soc_info = {
.version = JZ_I2S_JZ4780, .version = JZ_I2S_JZ4780,
.dai = &jz4780_i2s_dai, .dai = &jz4770_i2s_dai,
}; };
static const struct snd_soc_component_driver jz4740_i2s_component = { static const struct snd_soc_component_driver jz4740_i2s_component = {
@ -502,6 +508,7 @@ static const struct snd_soc_component_driver jz4740_i2s_component = {
static const struct of_device_id jz4740_of_matches[] = { static const struct of_device_id jz4740_of_matches[] = {
{ .compatible = "ingenic,jz4740-i2s", .data = &jz4740_i2s_soc_info }, { .compatible = "ingenic,jz4740-i2s", .data = &jz4740_i2s_soc_info },
{ .compatible = "ingenic,jz4760-i2s", .data = &jz4760_i2s_soc_info }, { .compatible = "ingenic,jz4760-i2s", .data = &jz4760_i2s_soc_info },
{ .compatible = "ingenic,jz4770-i2s", .data = &jz4770_i2s_soc_info },
{ .compatible = "ingenic,jz4780-i2s", .data = &jz4780_i2s_soc_info }, { .compatible = "ingenic,jz4780-i2s", .data = &jz4780_i2s_soc_info },
{ /* sentinel */ } { /* sentinel */ }
}; };