ASoC: wm9712: Remove driver specific version
Subsystems (3)
PATCH 1/2 ASoC: wm9712: Remove driver specific version
I don't think it's been updated since the driver was merged.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm9712.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
sound/soc/codecs/wm9712.c +0 -4
@@ -22,8 +22,6 @@#include <sound/soc.h> #include "wm9712.h" -#define WM9712_VERSION "0.4" -static unsigned int ac97_read (struct snd_soc_codec *codec,unsigned int reg); static int ac97_write(struct snd_soc_codec *codec,
@@ -619,8 +617,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) {int ret =0 ; -printk (KERN_INFO "WM9711/WM9712 SoC Audio Codec %s\n" ,WM9712_VERSION ); - ret =snd_soc_new_ac97_codec (codec, &soc_ac97_ops,0 );if (ret <0 ) {printk (KERN_ERR "wm9712: failed to register AC97 codec\n" );
Signature · 1 line
1.7.9.rc1
PATCH 2/2 ASoC: wm9712: Add TLV information for microphone input
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm9712.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
sound/soc/codecs/wm9712.c +7 -3
@@ -20,6 +20,7 @@#include <sound/ac97_codec.h> #include <sound/initval.h> #include <sound/soc.h> +#include <sound/tlv.h> #include "wm9712.h" static unsigned int ac97_read(struct snd_soc_codec *codec,
@@ -69,6 +70,9 @@ static const char *wm9712_rec_sel[] = {"Mic", "NC", "NC", "Speaker Mixer",static const char *wm9712_ng_type[] = {"Constant Gain" ,"Mute" };static const char *wm9712_diff_sel[] = {"Mic" ,"Line" }; +static const DECLARE_TLV_DB_SCALE(main_tlv, -3450, 150, 0); +static const DECLARE_TLV_DB_SCALE(boost_tlv, 0, 2000, 0); +static const struct soc_enum wm9712_enum[] = {SOC_ENUM_SINGLE (AC97_PCI_SVID ,14 ,4 , wm9712_alc_select),SOC_ENUM_SINGLE (AC97_VIDEO ,12 ,4 , wm9712_alc_mux),
@@ -147,9 +151,9 @@ SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),SOC_DOUBLE ("Capture Volume" ,AC97_REC_GAIN ,8 ,0 ,63 ,1 ),SOC_SINGLE ("Capture ZC Switch" ,AC97_REC_GAIN ,7 ,1 ,0 ), -SOC_SINGLE ("Mic 1 Volume" ,AC97_MIC ,8 ,31 ,1 ), -SOC_SINGLE ("Mic 2 Volume" ,AC97_MIC ,0 ,31 ,1 ), -SOC_SINGLE("Mic 20dB Boost Switch", AC97_MIC, 7, 1, 0), +SOC_SINGLE_TLV ("Mic 1 Volume" ,AC97_MIC ,8 ,31 ,1 , main_tlv), +SOC_SINGLE_TLV ("Mic 2 Volume" ,AC97_MIC ,0 ,31 ,1 , main_tlv), +SOC_SINGLE_TLV("Mic Boost Volume", AC97_MIC, 7, 1, 0, boost_tlv), };/* We have to create a fake left and right HP mixers because
Signature · 1 line
1.7.9.rc1