diff options
| -rw-r--r-- | sound/soc/codecs/wm9713.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 27047839172d..ac13fc8f5c70 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c | |||
| @@ -59,13 +59,12 @@ static const u16 wm9713_reg[] = { | |||
| 59 | 0x0000, 0x0000, 0x0000, 0x0000, | 59 | 0x0000, 0x0000, 0x0000, 0x0000, |
| 60 | 0x0000, 0x0000, 0x0000, 0x0006, | 60 | 0x0000, 0x0000, 0x0000, 0x0006, |
| 61 | 0x0001, 0x0000, 0x574d, 0x4c13, | 61 | 0x0001, 0x0000, 0x574d, 0x4c13, |
| 62 | 0x0000, 0x0000, 0x0000 | 62 | 0x0000, 0x0000 |
| 63 | }; | 63 | }; |
| 64 | 64 | ||
| 65 | /* virtual HP mixers regs */ | 65 | /* virtual HP mixers regs */ |
| 66 | #define HPL_MIXER 0x80 | 66 | #define HPL_MIXER 0x80 |
| 67 | #define HPR_MIXER 0x82 | 67 | #define HPR_MIXER 0x82 |
| 68 | #define MICB_MUX 0x82 | ||
| 69 | 68 | ||
| 70 | static const char *wm9713_mic_mixer[] = {"Stereo", "Mic 1", "Mic 2", "Mute"}; | 69 | static const char *wm9713_mic_mixer[] = {"Stereo", "Mic 1", "Mic 2", "Mute"}; |
| 71 | static const char *wm9713_rec_mux[] = {"Stereo", "Left", "Right", "Mute"}; | 70 | static const char *wm9713_rec_mux[] = {"Stereo", "Left", "Right", "Mute"}; |
| @@ -110,7 +109,7 @@ SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 10, 8, wm9713_dac_inv), /* dac invert 2 15 */ | |||
| 110 | SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_bass), /* bass control 16 */ | 109 | SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_bass), /* bass control 16 */ |
| 111 | SOC_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type), /* noise gate type 17 */ | 110 | SOC_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type), /* noise gate type 17 */ |
| 112 | SOC_ENUM_SINGLE(AC97_3D_CONTROL, 12, 3, wm9713_mic_select), /* mic selection 18 */ | 111 | SOC_ENUM_SINGLE(AC97_3D_CONTROL, 12, 3, wm9713_mic_select), /* mic selection 18 */ |
| 113 | SOC_ENUM_SINGLE(MICB_MUX, 0, 2, wm9713_micb_select), /* mic selection 19 */ | 112 | SOC_ENUM_SINGLE_VIRT(2, wm9713_micb_select), /* mic selection 19 */ |
| 114 | }; | 113 | }; |
| 115 | 114 | ||
| 116 | static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0); | 115 | static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0); |
