diff options
| author | Mark Brown | 2019-06-06 23:44:24 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-06-06 23:44:24 +0200 |
| commit | a8e992342ce4cd173d437d0aa4eecc9e30489f72 (patch) | |
| tree | dbb45d586ed7370e32c006c506d6954d06779914 /sound/soc/sunxi | |
| parent | ASoC: soc-core: remove legacy style dai_link (diff) | |
| parent | SoC: rt274: Fix internal jack assignment in set_jack callback (diff) | |
| download | kernel-qcow2-linux-a8e992342ce4cd173d437d0aa4eecc9e30489f72.tar.gz kernel-qcow2-linux-a8e992342ce4cd173d437d0aa4eecc9e30489f72.tar.xz kernel-qcow2-linux-a8e992342ce4cd173d437d0aa4eecc9e30489f72.zip | |
Merge branch 'asoc-5.2' into asoc-5.3
Diffstat (limited to 'sound/soc/sunxi')
| -rw-r--r-- | sound/soc/sunxi/sun4i-i2s.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 03696f880080..f3ff5a0b5666 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -110,7 +110,7 @@ #define SUN8I_I2S_TX_CHAN_MAP_REG 0x44 #define SUN8I_I2S_TX_CHAN_SEL_REG 0x34 -#define SUN8I_I2S_TX_CHAN_OFFSET_MASK GENMASK(13, 11) +#define SUN8I_I2S_TX_CHAN_OFFSET_MASK GENMASK(13, 12) #define SUN8I_I2S_TX_CHAN_OFFSET(offset) (offset << 12) #define SUN8I_I2S_TX_CHAN_EN_MASK GENMASK(11, 4) #define SUN8I_I2S_TX_CHAN_EN(num_chan) (((1 << num_chan) - 1) << 4) @@ -490,6 +490,10 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG, SUN8I_I2S_TX_CHAN_OFFSET_MASK, SUN8I_I2S_TX_CHAN_OFFSET(offset)); + + regmap_update_bits(i2s->regmap, SUN8I_I2S_RX_CHAN_SEL_REG, + SUN8I_I2S_TX_CHAN_OFFSET_MASK, + SUN8I_I2S_TX_CHAN_OFFSET(offset)); } regmap_field_write(i2s->field_fmt_mode, val); |