openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: sun4i-i2s: Remove duplicated quirks structure 

The A83t and H3 have the same quirks, so it doesn't make sense to duplicate
the quirks structure.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://lore.kernel.org/r/5ade5de27d23918c5ef30387c23aead951d5ad64.1566242458.git-series.maxime.ripard@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Maxime Ripard 2019-08-19 21:25:24 +02:00 committed by Mark Brown
parent 69e450e50c
commit 3e9acd7ac6
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sound/soc/sunxi/sun4i-i2s.c
View File

@ -1062,25 +1062,6 @@ static const struct sun4i_i2s_quirks sun8i_a83t_i2s_quirks = {
.set_fmt = sun8i_i2s_set_soc_fmt, .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,
.has_fmt_set_lrck_period = true,
.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 = { static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {
.has_reset = true, .has_reset = true,
.reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG, .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG,
@ -1262,7 +1243,7 @@ static const struct of_device_id sun4i_i2s_match[] = {
}, },
{ {
.compatible = "allwinner,sun8i-h3-i2s", .compatible = "allwinner,sun8i-h3-i2s",
.data = &sun8i_h3_i2s_quirks, .data = &sun8i_a83t_i2s_quirks,
}, },
{ {
.compatible = "allwinner,sun50i-a64-codec-i2s", .compatible = "allwinner,sun50i-a64-codec-i2s",