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

Commit 3509476e authored by Marcus Cooper's avatar Marcus Cooper Committed by Mark Brown
Browse files

ASoC: sun4i-i2s: Add TX FIFO offset to quirks 



It has been seen that the newer SoCs have a different TX FIFO
address. Add this to the quirks structure.

Signed-off-by: default avatarMarcus Cooper <codekipper@gmail.com>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cd1c63df

sound/soc/sunxi/sun4i-i2s.c

+6 −1
Original line number Diff line number Diff line
@@ -94,12 +94,14 @@ 
 * struct sun4i_i2s_quirks - Differences between SoC variants.

 *

 * @has_reset: SoC needs reset deasserted.

 * @reg_offset_txdata: offset of the tx fifo.

 * @sun4i_i2s_regmap: regmap config to use.

 * @mclk_offset: Value by which mclkdiv needs to be adjusted.

 * @bclk_offset: Value by which bclkdiv needs to be adjusted.

 */

struct sun4i_i2s_quirks {

	bool				has_reset;

	unsigned int			reg_offset_txdata;	/* TX FIFO */

	const struct regmap_config	*sun4i_i2s_regmap;

	unsigned int			mclk_offset;

	unsigned int			bclk_offset;
@@ -677,11 +679,13 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) 


static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = {

	.has_reset		= false,

	.reg_offset_txdata	= SUN4I_I2S_FIFO_TX_REG,

	.sun4i_i2s_regmap	= &sun4i_i2s_regmap_config,

};



static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = {

	.has_reset		= true,

	.reg_offset_txdata	= SUN4I_I2S_FIFO_TX_REG,

	.sun4i_i2s_regmap	= &sun4i_i2s_regmap_config,

};
@@ -750,7 +754,8 @@ static int sun4i_i2s_probe(struct platform_device *pdev) 
		}

	}



	i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG;

	i2s->playback_dma_data.addr = res->start +

					i2s->variant->reg_offset_txdata;

	i2s->playback_dma_data.maxburst = 8;



	i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG;