mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 15:21:39 +00:00
89 lines
3.6 KiB
Diff
89 lines
3.6 KiB
Diff
From dfd2293c8626f1282e6a6e30f591c0a83146f3d4 Mon Sep 17 00:00:00 2001
|
|
From: Marcus Cooper <codekipper@gmail.com>
|
|
Date: Sat, 19 Aug 2017 14:48:36 +0200
|
|
Subject: ASoC: sun4i-i2s: Add regmap field to set DAI format
|
|
|
|
On the newer SoCs the bits to configure the operational mode are
|
|
located in a different register. Add a regmap field so that this
|
|
location can be configured.
|
|
|
|
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
|
|
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/sunxi/sun4i-i2s.c | 15 ++++++++++++---
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
(limited to 'sound/soc/sunxi')
|
|
|
|
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
|
|
index 761b7c0..d9910f6 100644
|
|
--- a/sound/soc/sunxi/sun4i-i2s.c
|
|
+++ b/sound/soc/sunxi/sun4i-i2s.c
|
|
@@ -106,6 +106,7 @@
|
|
* @field_fmt_sr: regmap field to set sample resolution.
|
|
* @field_fmt_bclk: regmap field to set clk polarity.
|
|
* @field_fmt_lrclk: regmap field to set frame polarity.
|
|
+ * @field_fmt_mode: regmap field to set the operational mode.
|
|
* @field_txchanmap: location of the tx channel mapping register.
|
|
* @field_rxchanmap: location of the rx channel mapping register.
|
|
* @field_txchansel: location of the tx channel select bit fields.
|
|
@@ -125,6 +126,7 @@ struct sun4i_i2s_quirks {
|
|
struct reg_field field_fmt_sr;
|
|
struct reg_field field_fmt_bclk;
|
|
struct reg_field field_fmt_lrclk;
|
|
+ struct reg_field field_fmt_mode;
|
|
struct reg_field field_txchanmap;
|
|
struct reg_field field_rxchanmap;
|
|
struct reg_field field_txchansel;
|
|
@@ -148,6 +150,7 @@ struct sun4i_i2s {
|
|
struct regmap_field *field_fmt_sr;
|
|
struct regmap_field *field_fmt_bclk;
|
|
struct regmap_field *field_fmt_lrclk;
|
|
+ struct regmap_field *field_fmt_mode;
|
|
struct regmap_field *field_txchanmap;
|
|
struct regmap_field *field_rxchanmap;
|
|
struct regmap_field *field_txchansel;
|
|
@@ -365,9 +368,7 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|
return -EINVAL;
|
|
}
|
|
|
|
- regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT0_REG,
|
|
- SUN4I_I2S_FMT0_FMT_MASK,
|
|
- val);
|
|
+ regmap_field_write(i2s->field_fmt_mode, val);
|
|
|
|
/* DAI clock polarity */
|
|
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
|
|
@@ -722,6 +723,7 @@ static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = {
|
|
.field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5),
|
|
.field_fmt_bclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 6, 6),
|
|
.field_fmt_lrclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 7, 7),
|
|
+ .field_fmt_mode = REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 1),
|
|
.field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31),
|
|
.field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
|
|
.field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
|
|
@@ -737,6 +739,7 @@ static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = {
|
|
.field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5),
|
|
.field_fmt_bclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 6, 6),
|
|
.field_fmt_lrclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 7, 7),
|
|
+ .field_fmt_mode = REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 1),
|
|
.field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31),
|
|
.field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31),
|
|
.field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2),
|
|
@@ -776,6 +779,12 @@ static int sun4i_i2s_init_regmap_fields(struct device *dev,
|
|
if (IS_ERR(i2s->field_fmt_lrclk))
|
|
return PTR_ERR(i2s->field_fmt_lrclk);
|
|
|
|
+ i2s->field_fmt_mode =
|
|
+ devm_regmap_field_alloc(dev, i2s->regmap,
|
|
+ i2s->variant->field_fmt_mode);
|
|
+ if (IS_ERR(i2s->field_fmt_mode))
|
|
+ return PTR_ERR(i2s->field_fmt_mode);
|
|
+
|
|
i2s->field_txchanmap =
|
|
devm_regmap_field_alloc(dev, i2s->regmap,
|
|
i2s->variant->field_txchanmap);
|
|
--
|
|
cgit v1.1
|
|
|