ASoC: AC97 doesn't use regmap by default
PATCH 1/1 ASoC: AC97 doesn't use regmap by default
From: Manuel Lauss <[email protected]>
Since commit 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9 ("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.
--- sound/soc/codecs/ad1980.c | 1 + sound/soc/codecs/stac9766.c | 1 + sound/soc/codecs/wm9712.c | 1 + sound/soc/codecs/wm9713.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-)
sound/soc/codecs/ad1980.c +1 -0
@@ -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" );
sound/soc/codecs/stac9766.c +1 -0
@@ -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;
sound/soc/codecs/wm9712.c +1 -0
@@ -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" );
sound/soc/codecs/wm9713.c +1 -0
@@ -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 )
Signature · 1 line
1.7.8.6
Mark Brown
AppliedQuoted 8 lines · Manuel Lauss
From: Manuel Lauss <[email protected]>
Since commit
38cbf9598feba97de9f9b43efa9153fd7c1a2ec9("ASoC: core: Try to use regmap if the driver doesn't set up any I/O") any ASoC codec which doesn't setcodec::control_datais assumed to use regmap. That doesn't work with AC97 so this workaround sets thecodec::control_datamember to a random value to restore proper behaviour.
Applied, thanks.