mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
ASoC: jz4740-i2s: Add support for the JZ4760
The change of offset for the {rx,tx}_threshold fields in the conf register predates the JZ4780, and was first introduced in the JZ4760. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20200306222931.39664-5-paul@crapouillou.net Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
515d2757d3
commit
bde8ca7c87
1 changed files with 12 additions and 9 deletions
|
@ -49,12 +49,8 @@
|
||||||
|
|
||||||
#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12
|
#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12
|
||||||
#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8
|
#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8
|
||||||
#define JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 24
|
#define JZ4760_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 24
|
||||||
#define JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 16
|
#define JZ4760_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 16
|
||||||
#define JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_MASK \
|
|
||||||
(0xf << JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET)
|
|
||||||
#define JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_MASK \
|
|
||||||
(0x1f << JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET)
|
|
||||||
|
|
||||||
#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK (0x7 << 19)
|
#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK (0x7 << 19)
|
||||||
#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK (0x7 << 16)
|
#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK (0x7 << 16)
|
||||||
|
@ -90,6 +86,7 @@
|
||||||
|
|
||||||
enum jz47xx_i2s_version {
|
enum jz47xx_i2s_version {
|
||||||
JZ_I2S_JZ4740,
|
JZ_I2S_JZ4740,
|
||||||
|
JZ_I2S_JZ4760,
|
||||||
JZ_I2S_JZ4780,
|
JZ_I2S_JZ4780,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -403,9 +400,9 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
|
||||||
snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data,
|
snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data,
|
||||||
&i2s->capture_dma_data);
|
&i2s->capture_dma_data);
|
||||||
|
|
||||||
if (i2s->soc_info->version >= JZ_I2S_JZ4780) {
|
if (i2s->soc_info->version >= JZ_I2S_JZ4760) {
|
||||||
conf = (7 << JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
|
conf = (7 << JZ4760_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
|
||||||
(8 << JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
|
(8 << JZ4760_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
|
||||||
JZ_AIC_CONF_OVERFLOW_PLAY_LAST |
|
JZ_AIC_CONF_OVERFLOW_PLAY_LAST |
|
||||||
JZ_AIC_CONF_I2S |
|
JZ_AIC_CONF_I2S |
|
||||||
JZ_AIC_CONF_INTERNAL_CODEC;
|
JZ_AIC_CONF_INTERNAL_CODEC;
|
||||||
|
@ -467,6 +464,11 @@ static const struct i2s_soc_info jz4740_i2s_soc_info = {
|
||||||
.dai = &jz4740_i2s_dai,
|
.dai = &jz4740_i2s_dai,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct i2s_soc_info jz4760_i2s_soc_info = {
|
||||||
|
.version = JZ_I2S_JZ4760,
|
||||||
|
.dai = &jz4740_i2s_dai,
|
||||||
|
};
|
||||||
|
|
||||||
static struct snd_soc_dai_driver jz4780_i2s_dai = {
|
static struct snd_soc_dai_driver jz4780_i2s_dai = {
|
||||||
.probe = jz4740_i2s_dai_probe,
|
.probe = jz4740_i2s_dai_probe,
|
||||||
.remove = jz4740_i2s_dai_remove,
|
.remove = jz4740_i2s_dai_remove,
|
||||||
|
@ -499,6 +501,7 @@ static const struct snd_soc_component_driver jz4740_i2s_component = {
|
||||||
#ifdef CONFIG_OF
|
#ifdef CONFIG_OF
|
||||||
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,jz4780-i2s", .data = &jz4780_i2s_soc_info },
|
{ .compatible = "ingenic,jz4780-i2s", .data = &jz4780_i2s_soc_info },
|
||||||
{ /* sentinel */ }
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue