Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bc39b50 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: wm9713: Use virtual control instead of virtual register 



The wm9713 currently implements the virtual control for the Mic B Source MUX
using a virtual register. Replace this by using SOC_ENUM_SINGLE_VIRT().

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5efe89d9

sound/soc/codecs/wm9713.c

+2 −3
Original line number Diff line number Diff line
@@ -59,13 +59,12 @@ static const u16 wm9713_reg[] = { 
	0x0000, 0x0000, 0x0000, 0x0000,

	0x0000, 0x0000, 0x0000, 0x0006,

	0x0001, 0x0000, 0x574d, 0x4c13,

	0x0000, 0x0000, 0x0000

	0x0000, 0x0000

};



/* virtual HP mixers regs */

#define HPL_MIXER	0x80

#define HPR_MIXER	0x82

#define MICB_MUX	0x82



static const char *wm9713_mic_mixer[] = {"Stereo", "Mic 1", "Mic 2", "Mute"};

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 */ 
SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_bass), /* bass control 16 */

SOC_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type), /* noise gate type 17 */

SOC_ENUM_SINGLE(AC97_3D_CONTROL, 12, 3, wm9713_mic_select), /* mic selection 18 */

SOC_ENUM_SINGLE(MICB_MUX, 0, 2, wm9713_micb_select), /* mic selection 19 */

SOC_ENUM_SINGLE_VIRT(2, wm9713_micb_select), /* mic selection 19 */

};



static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0);