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

Commit 313769d9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/cs5535audio' into to-push

parents 8afabfa7 f144b7f6

include/sound/ac97_codec.h

+2 −0
Original line number Diff line number Diff line
@@ -281,10 +281,12 @@ 
/* specific - Analog Devices */

#define AC97_AD_TEST		0x5a	/* test register */

#define AC97_AD_TEST2		0x5c	/* undocumented test register 2 */

#define AC97_AD_HPFD_SHIFT	12	/* High Pass Filter Disable */

#define AC97_AD_CODEC_CFG	0x70	/* codec configuration */

#define AC97_AD_JACK_SPDIF	0x72	/* Jack Sense & S/PDIF */

#define AC97_AD_SERIAL_CFG	0x74	/* Serial Configuration */

#define AC97_AD_MISC		0x76	/* Misc Control Bits */

#define AC97_AD_VREFD_SHIFT	2	/* V_REFOUT Disable (AD1888) */



/* specific - Cirrus Logic */

#define AC97_CSR_ACMODE		0x5e	/* AC Mode Register */

sound/pci/ac97/ac97_patch.c

+3 −2
Original line number Diff line number Diff line
@@ -2054,8 +2054,9 @@ static const struct snd_kcontrol_new snd_ac97_ad1888_controls[] = { 
		.get = snd_ac97_ad1888_lohpsel_get,

		.put = snd_ac97_ad1888_lohpsel_put

	},

	AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, 2, 1, 1),

	AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, 12, 1, 1),

	AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, AC97_AD_VREFD_SHIFT, 1, 1),

	AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2,

			AC97_AD_HPFD_SHIFT, 1, 1),

	AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0),

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

sound/pci/cs5535audio/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o

snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o

ifdef CONFIG_MGEODE_LX

snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o

endif



# Toplevel Module Dependency

obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o

sound/pci/cs5535audio/cs5535audio.c

+11 −1
Original line number Diff line number Diff line
@@ -159,10 +159,14 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au) 
		return err;



	memset(&ac97, 0, sizeof(ac97));

	ac97.scaps = AC97_SCAP_AUDIO|AC97_SCAP_SKIP_MODEM;

	ac97.scaps = AC97_SCAP_AUDIO | AC97_SCAP_SKIP_MODEM

			| AC97_SCAP_POWER_SAVE;

	ac97.private_data = cs5535au;

	ac97.pci = cs5535au->pci;



	/* set any OLPC-specific scaps */

	olpc_prequirks(card, &ac97);



	if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {

		snd_printk(KERN_ERR "mixer failed\n");

		return err;
@@ -170,6 +174,12 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au) 


	snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);



	err = olpc_quirks(card, cs5535au->ac97);

	if (err < 0) {

		snd_printk(KERN_ERR "olpc quirks failed\n");

		return err;

	}



	return 0;

}

sound/pci/cs5535audio/cs5535audio.h

+39 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct cs5535audio_dma { 
	unsigned int buf_addr, buf_bytes;

	unsigned int period_bytes, periods;

	u32 saved_prd;

	int pcm_open_flag;

};



struct cs5535audio {
@@ -93,8 +94,46 @@ struct cs5535audio { 
	struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];

};



#ifdef CONFIG_PM

int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);

int snd_cs5535audio_resume(struct pci_dev *pci);

#endif



#if defined(CONFIG_OLPC) && defined(CONFIG_MGEODE_LX)

void __devinit olpc_prequirks(struct snd_card *card,

		struct snd_ac97_template *ac97);

int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);

void olpc_analog_input(struct snd_ac97 *ac97, int on);

void olpc_mic_bias(struct snd_ac97 *ac97, int on);



static inline void olpc_capture_open(struct snd_ac97 *ac97)

{

	/* default to Analog Input off */

	olpc_analog_input(ac97, 0);

	/* enable MIC Bias for recording */

	olpc_mic_bias(ac97, 1);

}



static inline void olpc_capture_close(struct snd_ac97 *ac97)

{

	/* disable Analog Input */

	olpc_analog_input(ac97, 0);

	/* disable the MIC Bias (so the recording LED turns off) */

	olpc_mic_bias(ac97, 0);

}

#else

static inline void olpc_prequirks(struct snd_card *card,

		struct snd_ac97_template *ac97) { }

static inline int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)

{

	return 0;

}

static inline void olpc_analog_input(struct snd_ac97 *ac97, int on) { }

static inline void olpc_mic_bias(struct snd_ac97 *ac97, int on) { }

static inline void olpc_capture_open(struct snd_ac97 *ac97) { }

static inline void olpc_capture_close(struct snd_ac97 *ac97) { }

#endif



int __devinit snd_cs5535audio_pcm(struct cs5535audio *cs5535audio);



#endif /* __SOUND_CS5535AUDIO_H */