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

Commit 13043984 authored by Keita Maehara's avatar Keita Maehara Committed by Jaroslav Kysela
Browse files

[ALSA] ac97: YMF743 missing controls support (1/2) 



These patches enable some YMF743 controls (Tone/3D/IEC958) that won't
be detected with the current version of ALSA.
The first one contains only cosmetic changes to share a few
YMF753-specific symbols with YMF743.

Signed-off-by: default avatarKeita Maehara <maehara@debian.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent c929e5ef

include/sound/ac97_codec.h

+3 −3
Original line number Diff line number Diff line
@@ -345,9 +345,9 @@ 
#define AC97_ALC650_GPIO_STATUS		0x78

#define AC97_ALC650_CLOCK		0x7a



/* specific - Yamaha YMF753 */

#define AC97_YMF753_DIT_CTRL2	0x66	/* DIT Control 2 */

#define AC97_YMF753_3D_MODE_SEL	0x68	/* 3D Mode Select */

/* specific - Yamaha YMF7x3 */

#define AC97_YMF7X3_DIT_CTRL	0x66	/* DIT Control (YMF743) / 2 (YMF753) */

#define AC97_YMF7X3_3D_MODE_SEL	0x68	/* 3D Mode Select */



/* specific - C-Media */

#define AC97_CM9738_VENDOR_CTRL	0x5a

sound/pci/ac97/ac97_patch.c

+43 −27
Original line number Diff line number Diff line
@@ -205,8 +205,11 @@ static inline int is_shared_micin(struct snd_ac97 *ac97) 


/* The following snd_ac97_ymf753_... items added by David Shust (dshust@shustring.com) */



/* It is possible to indicate to the Yamaha YMF753 the type of speakers being used. */

static int snd_ac97_ymf753_info_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

/* It is possible to indicate to the Yamaha YMF7x3 the type of

   speakers being used. */



static int snd_ac97_ymf7x3_info_speaker(struct snd_kcontrol *kcontrol,

					struct snd_ctl_elem_info *uinfo)

{

	static char *texts[3] = {

		"Standard", "Small", "Smaller"
@@ -221,12 +224,13 @@ static int snd_ac97_ymf753_info_speaker(struct snd_kcontrol *kcontrol, struct sn 
	return 0;

}



static int snd_ac97_ymf753_get_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

static int snd_ac97_ymf7x3_get_speaker(struct snd_kcontrol *kcontrol,

				       struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	unsigned short val;



	val = ac97->regs[AC97_YMF753_3D_MODE_SEL];

	val = ac97->regs[AC97_YMF7X3_3D_MODE_SEL];

	val = (val >> 10) & 3;

	if (val > 0)    /* 0 = invalid */

		val--;
@@ -234,7 +238,8 @@ static int snd_ac97_ymf753_get_speaker(struct snd_kcontrol *kcontrol, struct snd 
	return 0;

}



static int snd_ac97_ymf753_put_speaker(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

static int snd_ac97_ymf7x3_put_speaker(struct snd_kcontrol *kcontrol,

				       struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	unsigned short val;
@@ -242,20 +247,22 @@ static int snd_ac97_ymf753_put_speaker(struct snd_kcontrol *kcontrol, struct snd 
	if (ucontrol->value.enumerated.item[0] > 2)

		return -EINVAL;

	val = (ucontrol->value.enumerated.item[0] + 1) << 10;

	return snd_ac97_update(ac97, AC97_YMF753_3D_MODE_SEL, val);

	return snd_ac97_update(ac97, AC97_YMF7X3_3D_MODE_SEL, val);

}



static const struct snd_kcontrol_new snd_ac97_ymf753_controls_speaker =

static const struct snd_kcontrol_new snd_ac97_ymf7x3_controls_speaker =

{

	.iface  = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name   = "3D Control - Speaker",

	.info   = snd_ac97_ymf753_info_speaker,

	.get    = snd_ac97_ymf753_get_speaker,

	.put    = snd_ac97_ymf753_put_speaker,

	.info   = snd_ac97_ymf7x3_info_speaker,

	.get    = snd_ac97_ymf7x3_get_speaker,

	.put    = snd_ac97_ymf7x3_put_speaker,

};



/* It is possible to indicate to the Yamaha YMF753 the source to direct to the S/PDIF output. */

static int snd_ac97_ymf753_spdif_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)

/* It is possible to indicate to the Yamaha YMF7x3 the source to

   direct to the S/PDIF output. */

static int snd_ac97_ymf7x3_spdif_source_info(struct snd_kcontrol *kcontrol,

					     struct snd_ctl_elem_info *uinfo)

{

	static char *texts[2] = { "AC-Link", "A/D Converter" };
@@ -268,17 +275,19 @@ static int snd_ac97_ymf753_spdif_source_info(struct snd_kcontrol *kcontrol, stru 
	return 0;

}



static int snd_ac97_ymf753_spdif_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

static int snd_ac97_ymf7x3_spdif_source_get(struct snd_kcontrol *kcontrol,

					    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	unsigned short val;



	val = ac97->regs[AC97_YMF753_DIT_CTRL2];

	val = ac97->regs[AC97_YMF7X3_DIT_CTRL];

	ucontrol->value.enumerated.item[0] = (val >> 1) & 1;

	return 0;

}



static int snd_ac97_ymf753_spdif_source_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

static int snd_ac97_ymf7x3_spdif_source_put(struct snd_kcontrol *kcontrol,

					    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	unsigned short val;
@@ -286,7 +295,7 @@ static int snd_ac97_ymf753_spdif_source_put(struct snd_kcontrol *kcontrol, struc 
	if (ucontrol->value.enumerated.item[0] > 1)

		return -EINVAL;

	val = ucontrol->value.enumerated.item[0] << 1;

	return snd_ac97_update_bits(ac97, AC97_YMF753_DIT_CTRL2, 0x0002, val);

	return snd_ac97_update_bits(ac97, AC97_YMF7X3_DIT_CTRL, 0x0002, val);

}



/* The AC'97 spec states that the S/PDIF signal is to be output at pin 48.
@@ -311,7 +320,7 @@ static int snd_ac97_ymf753_spdif_output_pin_get(struct snd_kcontrol *kcontrol, s 
	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	unsigned short val;



	val = ac97->regs[AC97_YMF753_DIT_CTRL2];

	val = ac97->regs[AC97_YMF7X3_DIT_CTRL];

	ucontrol->value.enumerated.item[0] = (val & 0x0008) ? 2 : (val & 0x0020) ? 1 : 0;

	return 0;

}
@@ -325,7 +334,7 @@ static int snd_ac97_ymf753_spdif_output_pin_put(struct snd_kcontrol *kcontrol, s 
		return -EINVAL;

	val = (ucontrol->value.enumerated.item[0] == 2) ? 0x0008 :

	      (ucontrol->value.enumerated.item[0] == 1) ? 0x0020 : 0;

	return snd_ac97_update_bits(ac97, AC97_YMF753_DIT_CTRL2, 0x0028, val);

	return snd_ac97_update_bits(ac97, AC97_YMF7X3_DIT_CTRL, 0x0028, val);

	/* The following can be used to direct S/PDIF output to pin 47 (EAPD).

	   snd_ac97_write_cache(ac97, 0x62, snd_ac97_read(ac97, 0x62) | 0x0008); */

}
@@ -334,9 +343,9 @@ static const struct snd_kcontrol_new snd_ac97_ymf753_controls_spdif[3] = { 
	{

		.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,

		.name	= SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",

		.info	= snd_ac97_ymf753_spdif_source_info,

		.get	= snd_ac97_ymf753_spdif_source_get,

		.put	= snd_ac97_ymf753_spdif_source_put,

		.info	= snd_ac97_ymf7x3_spdif_source_info,

		.get	= snd_ac97_ymf7x3_spdif_source_get,

		.put	= snd_ac97_ymf7x3_spdif_source_put,

	},

	{

		.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -345,22 +354,29 @@ static const struct snd_kcontrol_new snd_ac97_ymf753_controls_spdif[3] = { 
		.get	= snd_ac97_ymf753_spdif_output_pin_get,

		.put	= snd_ac97_ymf753_spdif_output_pin_put,

	},

	AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",NONE,NONE) "Mute", AC97_YMF753_DIT_CTRL2, 2, 1, 1)

	AC97_SINGLE(SNDRV_CTL_NAME_IEC958("", NONE, NONE) "Mute",

		    AC97_YMF7X3_DIT_CTRL, 2, 1, 1)

};



static int patch_yamaha_ymf753_3d(struct snd_ac97 * ac97)

static int patch_yamaha_ymf7x3_3d(struct snd_ac97 *ac97)

{

	struct snd_kcontrol *kctl;

	int err;



	if ((err = snd_ctl_add(ac97->bus->card, kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97))) < 0)

	kctl = snd_ac97_cnew(&snd_ac97_controls_3d[0], ac97);

	err = snd_ctl_add(ac97->bus->card, kctl);

	if (err < 0)

		return err;

	strcpy(kctl->id.name, "3D Control - Wide");

	kctl->private_value = AC97_SINGLE_VALUE(AC97_3D_CONTROL, 9, 7, 0);

	snd_ac97_write_cache(ac97, AC97_3D_CONTROL, 0x0000);

	if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&snd_ac97_ymf753_controls_speaker, ac97))) < 0)



	err = snd_ctl_add(ac97->bus->card,

			  snd_ac97_cnew(&snd_ac97_ymf7x3_controls_speaker,

					ac97));

	if (err < 0)

		return err;

	snd_ac97_write_cache(ac97, AC97_YMF753_3D_MODE_SEL, 0x0c00);

	snd_ac97_write_cache(ac97, AC97_YMF7X3_3D_MODE_SEL, 0x0c00);

	return 0;

}
@@ -374,7 +390,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97) 
}



static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {

	.build_3d	= patch_yamaha_ymf753_3d,

	.build_3d	= patch_yamaha_ymf7x3_3d,

	.build_post_spdif = patch_yamaha_ymf753_post_spdif

};