mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ASoC: AC97 doesn't use regmap by default
Since commit 38cbf9598f
("ASoC: core: Try to use regmap if the driver doesn't set up any I/O")
any ASoC codec which doesn't set codec::control_data is assumed
to use regmap. That doesn't work with AC97 so this workaround
sets the codec::control_data member to a random value to restore
proper behaviour.
Tested with WM9712.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
eef69ac7c9
commit
d0e3cce914
4 changed files with 4 additions and 0 deletions
|
@ -186,6 +186,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
|
|||
|
||||
printk(KERN_INFO "AD1980 SoC Audio Codec\n");
|
||||
|
||||
codec->control_data = codec; /* we don't use regmap! */
|
||||
ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR "ad1980: failed to register AC97 codec\n");
|
||||
|
|
|
@ -340,6 +340,7 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec)
|
|||
|
||||
printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION);
|
||||
|
||||
codec->control_data = codec; /* we don't use regmap! */
|
||||
ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
|
||||
if (ret < 0)
|
||||
goto codec_err;
|
||||
|
|
|
@ -619,6 +619,7 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
|
|||
{
|
||||
int ret = 0;
|
||||
|
||||
codec->control_data = codec; /* we don't use regmap! */
|
||||
ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR "wm9712: failed to register AC97 codec\n");
|
||||
|
|
|
@ -1196,6 +1196,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec)
|
|||
if (wm9713 == NULL)
|
||||
return -ENOMEM;
|
||||
snd_soc_codec_set_drvdata(codec, wm9713);
|
||||
codec->control_data = wm9713; /* we don't use regmap! */
|
||||
|
||||
ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
|
||||
if (ret < 0)
|
||||
|
|
Loading…
Reference in a new issue