diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:28:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:28:08 +0200 |
| commit | c2913b140f901a705809f8b6c83998cf8147f848 (patch) | |
| tree | 53686878548921b83e8d9db437c4437140561980 /sound/soc/sunxi/sun4i-i2s.c | |
| parent | 5d78e1c2b7f4be00bbe62141603a631dc7812f35 (diff) | |
| parent | 30c21734d853dae99d05a5295a59b7e26ccd5135 (diff) | |
| download | linux-c2913b140f901a705809f8b6c83998cf8147f848.tar.bz2 | |
Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.3
A relatively large batch of mostly unremarkable fixes here, a couple of
small core fixes for fairly obscure issues, more comment/email updates
with no code impact than usual and a bunch of small driver fixes.
The support for new sample rates in the max98373 driver is a fix for the
fact that the driver declared support for those rates but would in fact
return an error if these rates were selected.
Diffstat (limited to 'sound/soc/sunxi/sun4i-i2s.c')
| -rw-r--r-- | sound/soc/sunxi/sun4i-i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 9b2232908b65..7fa5c61169db 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1002,8 +1002,8 @@ static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = { .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31), .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2), .field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2), - .get_sr = sun8i_i2s_get_sr_wss, - .get_wss = sun8i_i2s_get_sr_wss, + .get_sr = sun4i_i2s_get_sr, + .get_wss = sun4i_i2s_get_wss, }; static int sun4i_i2s_init_regmap_fields(struct device *dev, |