Commit 633c7e92 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Takashi Iwai
Browse files

ALSA: wss: reuse CS4231 controls for AD1848 



The C4231 control set is a superset of the AD1848 control
set so reuse the CS4231 controls definitions for the AD1848.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent abd134db

sound/isa/wss/wss_lib.c

+23 −56
Original line number Diff line number Diff line
@@ -2200,9 +2200,9 @@ static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0); 
static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);

static const DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0);



static struct snd_kcontrol_new snd_ad1848_controls[] = {

WSS_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT,

	   7, 7, 1, 1),

static struct snd_kcontrol_new snd_wss_controls[] = {

WSS_DOUBLE("PCM Playback Switch", 0,

		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),

WSS_DOUBLE_TLV("PCM Playback Volume", 0,

		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1,

		db_scale_6bit),
@@ -2219,40 +2219,23 @@ WSS_DOUBLE_TLV("Aux Playback Volume", 1, 
WSS_DOUBLE_TLV("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT,

		0, 0, 15, 0, db_scale_rec_gain),

{

	.name = "Capture Source",

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Capture Source",

	.info = snd_wss_info_mux,

	.get = snd_wss_get_mux,

	.put = snd_wss_put_mux,

},

WSS_DOUBLE("Mic Boost", 0,

		CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0),

WSS_SINGLE("Loopback Capture Switch", 0, CS4231_LOOPBACK, 0, 1, 0),

WSS_SINGLE("Loopback Capture Switch", 0,

		CS4231_LOOPBACK, 0, 1, 0),

WSS_SINGLE_TLV("Loopback Capture Volume", 0, CS4231_LOOPBACK, 2, 63, 1,

		db_scale_6bit),

};



static struct snd_kcontrol_new snd_wss_controls[] = {

WSS_DOUBLE("PCM Playback Switch", 0,

		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),

WSS_DOUBLE_TLV("PCM Playback Volume", 0,

		CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1,

		db_scale_6bit),

WSS_DOUBLE("Line Playback Switch", 0,

		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1),

WSS_DOUBLE_TLV("Line Playback Volume", 0,

		CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1,

		db_scale_5bit_12db_max),

WSS_DOUBLE("Aux Playback Switch", 0,

		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1),

WSS_DOUBLE_TLV("Aux Playback Volume", 0,

		CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1,

		db_scale_5bit_12db_max),

WSS_DOUBLE("Aux Playback Switch", 1,

		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1),

WSS_DOUBLE_TLV("Aux Playback Volume", 1,

		CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1,

		db_scale_5bit_12db_max),

WSS_SINGLE("Mono Playback Switch", 0,

		CS4231_MONO_CTRL, 7, 1, 1),

WSS_SINGLE_TLV("Mono Playback Volume", 0,
@@ -2262,21 +2245,6 @@ WSS_SINGLE("Mono Output Playback Switch", 0, 
		CS4231_MONO_CTRL, 6, 1, 1),

WSS_SINGLE("Mono Output Playback Bypass", 0,

		CS4231_MONO_CTRL, 5, 1, 0),

WSS_DOUBLE_TLV("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT,

		0, 0, 15, 0, db_scale_rec_gain),

{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Capture Source",

	.info = snd_wss_info_mux,

	.get = snd_wss_get_mux,

	.put = snd_wss_put_mux,

},

WSS_DOUBLE("Mic Boost", 0,

		CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0),

WSS_SINGLE("Loopback Capture Switch", 0,

		CS4231_LOOPBACK, 0, 1, 0),

WSS_SINGLE_TLV("Loopback Capture Volume", 0, CS4231_LOOPBACK, 2, 63, 1,

		db_scale_6bit),

};



static struct snd_kcontrol_new snd_opti93x_controls[] = {
@@ -2343,22 +2311,21 @@ int snd_wss_mixer(struct snd_wss *chip) 
			if (err < 0)

				return err;

		}

	else if (chip->hardware & WSS_HW_AD1848_MASK)

		for (idx = 0; idx < ARRAY_SIZE(snd_ad1848_controls); idx++) {

			err = snd_ctl_add(card,

					snd_ctl_new1(&snd_ad1848_controls[idx],

						     chip));

			if (err < 0)

				return err;

		}

	else

		for (idx = 0; idx < ARRAY_SIZE(snd_wss_controls); idx++) {

	else {

		int count = ARRAY_SIZE(snd_wss_controls);



		/* Use only the first 11 entries on AD1848 */

		if (chip->hardware & WSS_HW_AD1848_MASK)

			count = 11;



		for (idx = 0; idx < count; idx++) {

			err = snd_ctl_add(card,

					snd_ctl_new1(&snd_wss_controls[idx],

						     chip));

			if (err < 0)

				return err;

		}

	}

	return 0;

}

EXPORT_SYMBOL(snd_wss_mixer);