aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@bootlin.com>2019-08-19 15:25:24 -0400
committerMark Brown <broonie@kernel.org>2019-08-20 13:33:52 -0400
commit3e9acd7ac6933cdc20c441bbf9a38ed9e42e1490 (patch)
tree516962353dcbb3f229c64b6ed146e476372ff91a /sound
parent69e450e50ca6dde566f3ac3f2c329fb0492441ef (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sunxi/sun4i-i2s.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 9468584f4eb0..4c636f1cf7dc 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1062,25 +1062,6 @@ static const struct sun4i_i2s_quirks sun8i_a83t_i2s_quirks = {
1062 .set_fmt = sun8i_i2s_set_soc_fmt, 1062 .set_fmt = sun8i_i2s_set_soc_fmt,
1063}; 1063};
1064 1064
1065static const struct sun4i_i2s_quirks sun8i_h3_i2s_quirks = {
1066 .has_reset = true,
1067 .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG,
1068 .sun4i_i2s_regmap = &sun8i_i2s_regmap_config,
1069 .has_fmt_set_lrck_period = true,
1070 .field_clkdiv_mclk_en = REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 8, 8),
1071 .field_fmt_wss = REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 2),
1072 .field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 6),
1073 .bclk_dividers = sun8i_i2s_clk_div,
1074 .num_bclk_dividers = ARRAY_SIZE(sun8i_i2s_clk_div),
1075 .mclk_dividers = sun8i_i2s_clk_div,
1076 .num_mclk_dividers = ARRAY_SIZE(sun8i_i2s_clk_div),
1077 .get_bclk_parent_rate = sun8i_i2s_get_bclk_parent_rate,
1078 .get_sr = sun8i_i2s_get_sr_wss,
1079 .get_wss = sun8i_i2s_get_sr_wss,
1080 .set_chan_cfg = sun8i_i2s_set_chan_cfg,
1081 .set_fmt = sun8i_i2s_set_soc_fmt,
1082};
1083
1084static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = { 1065static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = {
1085 .has_reset = true, 1066 .has_reset = true,
1086 .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG, 1067 .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG,
@@ -1262,7 +1243,7 @@ static const struct of_device_id sun4i_i2s_match[] = {
1262 }, 1243 },
1263 { 1244 {
1264 .compatible = "allwinner,sun8i-h3-i2s", 1245 .compatible = "allwinner,sun8i-h3-i2s",
1265 .data = &sun8i_h3_i2s_quirks, 1246 .data = &sun8i_a83t_i2s_quirks,
1266 }, 1247 },
1267 { 1248 {
1268 .compatible = "allwinner,sun50i-a64-codec-i2s", 1249 .compatible = "allwinner,sun50i-a64-codec-i2s",