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

Commit 93b9f426 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] es1938 - Clean up and fix trigger in PM 



Modules: ES1938 driver

- Clean up the last PM fix
- Add TRIGGER_SUSPEND/RESUME to disable/enable DMA properly during PM

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c913f69b

sound/pci/es1938.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -543,10 +543,12 @@ static int snd_es1938_capture_trigger(snd_pcm_substream_t * substream, 
	int val;

	int val;

	switch (cmd) {

	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

		val = 0x0f;

		val = 0x0f;

		chip->active |= ADC1;

		chip->active |= ADC1;

		break;

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

		val = 0x00;

		val = 0x00;

		chip->active &= ~ADC1;

		chip->active &= ~ADC1;

		break;

		break;
@@ -563,6 +565,7 @@ static int snd_es1938_playback1_trigger(snd_pcm_substream_t * substream, 
	es1938_t *chip = snd_pcm_substream_chip(substream);

	es1938_t *chip = snd_pcm_substream_chip(substream);

	switch (cmd) {

	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

		/* According to the documentation this should be:

		/* According to the documentation this should be:

		   0x13 but that value may randomly swap stereo channels */

		   0x13 but that value may randomly swap stereo channels */

                snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0x92);

                snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0x92);
@@ -575,6 +578,7 @@ static int snd_es1938_playback1_trigger(snd_pcm_substream_t * substream, 
		chip->active |= DAC2;

		chip->active |= DAC2;

		break;

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

		outb(0, SLIO_REG(chip, AUDIO2MODE));

		outb(0, SLIO_REG(chip, AUDIO2MODE));

		snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0);

		snd_es1938_mixer_write(chip, ESSSB_IREG_AUDIO2CONTROL1, 0);

		chip->active &= ~DAC2;

		chip->active &= ~DAC2;
@@ -592,10 +596,12 @@ static int snd_es1938_playback2_trigger(snd_pcm_substream_t * substream, 
	int val;

	int val;

	switch (cmd) {

	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

		val = 5;

		val = 5;

		chip->active |= DAC1;

		chip->active |= DAC1;

		break;

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

		val = 0;

		val = 0;

		chip->active &= ~DAC1;

		chip->active &= ~DAC1;

		break;

		break;
@@ -1402,7 +1408,9 @@ static int es1938_resume(snd_card_t *card) 
	unsigned char *s, *d;

	unsigned char *s, *d;





	pci_enable_device(chip->pci);

	pci_enable_device(chip->pci);

	request_irq(chip->pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip);

	request_irq(chip->pci->irq, snd_es1938_interrupt,

		    SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip);

	chip->irq = chip->pci->irq;

	snd_es1938_chip_init(chip);

	snd_es1938_chip_init(chip);





	/* restore mixer-related registers */

	/* restore mixer-related registers */