Unverified Commit bde8ca7c authored by Paul Cercueil's avatar Paul Cercueil Committed by Mark Brown
Browse files

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: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200306222931.39664-5-paul@crapouillou.net


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 515d2757

sound/soc/jz4740/jz4740-i2s.c

+12 −9
Original line number Diff line number Diff line
@@ -49,12 +49,8 @@ 


#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12

#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8

#define JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 24

#define JZ4780_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 JZ4760_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 24

#define JZ4760_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 16



#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK (0x7 << 19)

#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK (0x7 << 16)
@@ -90,6 +86,7 @@ 


enum jz47xx_i2s_version {

	JZ_I2S_JZ4740,

	JZ_I2S_JZ4760,

	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,

		&i2s->capture_dma_data);



	if (i2s->soc_info->version >= JZ_I2S_JZ4780) {

		conf = (7 << JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |

			(8 << JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |

	if (i2s->soc_info->version >= JZ_I2S_JZ4760) {

		conf = (7 << JZ4760_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |

			(8 << JZ4760_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |

			JZ_AIC_CONF_OVERFLOW_PLAY_LAST |

			JZ_AIC_CONF_I2S |

			JZ_AIC_CONF_INTERNAL_CODEC;
@@ -467,6 +464,11 @@ static const struct i2s_soc_info jz4740_i2s_soc_info = { 
	.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 = {

	.probe = jz4740_i2s_dai_probe,

	.remove = jz4740_i2s_dai_remove,
@@ -499,6 +501,7 @@ static const struct snd_soc_component_driver jz4740_i2s_component = { 
#ifdef CONFIG_OF

static const struct of_device_id jz4740_of_matches[] = {

	{ .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 },

	{ /* sentinel */ }

};