Unverified Commit 455b1d42 authored by Maxime Ripard's avatar Maxime Ripard Committed by Mark Brown
Browse files

ASoC: sunxi: Revert initial A83t support 



This reverts commit 3e9acd7a (ASoC: sun4i-i2s: Remove
duplicated quirks structure").

It turns out that while one I2S controller is described in the A83t
datasheet, the driver supports another, undocumented, one that has been
inherited from the older SoCs, while the documented one uses the new
design.

Fixes: 3e9acd7a ("ASoC: sun4i-i2s: Remove duplicated quirks structure")
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://lore.kernel.org/r/20190827093206.17919-1-mripard@kernel.org


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

sound/soc/sunxi/sun4i-i2s.c

+24 −1
Original line number Diff line number Diff line
@@ -1097,6 +1097,11 @@ static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = { 
	.set_fmt		= sun4i_i2s_set_soc_fmt,

};



/*

 * This doesn't describe the TDM controller documented in the A83t

 * datasheet, but the three undocumented I2S controller that use the

 * older design.

 */

static const struct sun4i_i2s_quirks sun8i_a83t_i2s_quirks = {

	.has_reset		= true,

	.reg_offset_txdata	= SUN8I_I2S_FIFO_TX_REG,
@@ -1115,6 +1120,24 @@ static const struct sun4i_i2s_quirks sun8i_a83t_i2s_quirks = { 
	.set_fmt		= sun8i_i2s_set_soc_fmt,

};



static const struct sun4i_i2s_quirks sun8i_h3_i2s_quirks = {

	.has_reset		= true,

	.reg_offset_txdata	= SUN8I_I2S_FIFO_TX_REG,

	.sun4i_i2s_regmap	= &sun8i_i2s_regmap_config,

	.field_clkdiv_mclk_en	= REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 8, 8),

	.field_fmt_wss		= REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 2),

	.field_fmt_sr		= REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 6),

	.bclk_dividers		= sun8i_i2s_clk_div,

	.num_bclk_dividers	= ARRAY_SIZE(sun8i_i2s_clk_div),

	.mclk_dividers		= sun8i_i2s_clk_div,

	.num_mclk_dividers	= ARRAY_SIZE(sun8i_i2s_clk_div),

	.get_bclk_parent_rate	= sun8i_i2s_get_bclk_parent_rate,

	.get_sr			= sun8i_i2s_get_sr_wss,

	.get_wss		= sun8i_i2s_get_sr_wss,

	.set_chan_cfg		= sun8i_i2s_set_chan_cfg,

	.set_fmt		= sun8i_i2s_set_soc_fmt,

};



static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {

	.has_reset		= true,

	.reg_offset_txdata	= SUN8I_I2S_FIFO_TX_REG,
@@ -1296,7 +1319,7 @@ static const struct of_device_id sun4i_i2s_match[] = { 
	},

	{

		.compatible = "allwinner,sun8i-h3-i2s",

		.data = &sun8i_a83t_i2s_quirks,

		.data = &sun8i_h3_i2s_quirks,

	},

	{

		.compatible = "allwinner,sun50i-a64-codec-i2s",

CRA Git | Maintained and supported by SUSTech CRA and CCSE