UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: snd-atmel-ac97c: do a proper reset of the external codec 

This patch will enable the AC97C before resetting the external codec,
leaving the AC97C disabled will result in floating I/O lines that can
affect the reset procedure.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Hans-Christian Egtvedt 2009-04-02 08:21:15 +02:00 committed by Takashi Iwai
parent df163587ea
commit 81baf3a7f6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/atmel/ac97c.c
View File

@ -730,17 +730,17 @@ static bool filter(struct dma_chan *chan, void *slave)
static void atmel_ac97c_reset(struct atmel_ac97c *chip) static void atmel_ac97c_reset(struct atmel_ac97c *chip)
{ {
ac97c_writel(chip, MR, AC97C_MR_WRST); ac97c_writel(chip, MR, 0);
ac97c_writel(chip, MR, AC97C_MR_ENA);
ac97c_writel(chip, CAMR, 0);
ac97c_writel(chip, COMR, 0);
if (gpio_is_valid(chip->reset_pin)) { if (gpio_is_valid(chip->reset_pin)) {
gpio_set_value(chip->reset_pin, 0); gpio_set_value(chip->reset_pin, 0);
/* AC97 v2.2 specifications says minimum 1 us. */ /* AC97 v2.2 specifications says minimum 1 us. */
udelay(10); udelay(2);
gpio_set_value(chip->reset_pin, 1); gpio_set_value(chip->reset_pin, 1);
} }
udelay(1);
ac97c_writel(chip, MR, AC97C_MR_ENA);
} }
static int __devinit atmel_ac97c_probe(struct platform_device *pdev) static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
@ -826,6 +826,8 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
snd_card_set_dev(card, &pdev->dev); snd_card_set_dev(card, &pdev->dev);
atmel_ac97c_reset(chip);
/* Enable overrun interrupt from codec channel */ /* Enable overrun interrupt from codec channel */
ac97c_writel(chip, COMR, AC97C_CSR_OVRUN); ac97c_writel(chip, COMR, AC97C_CSR_OVRUN);
ac97c_writel(chip, IER, ac97c_readl(chip, IMR) | AC97C_SR_COEVT); ac97c_writel(chip, IER, ac97c_readl(chip, IMR) | AC97C_SR_COEVT);
@ -836,8 +838,6 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
goto err_ac97_bus; goto err_ac97_bus;
} }
atmel_ac97c_reset(chip);
retval = atmel_ac97c_mixer_new(chip); retval = atmel_ac97c_mixer_new(chip);
if (retval) { if (retval) {
dev_dbg(&pdev->dev, "could not register ac97 mixer\n"); dev_dbg(&pdev->dev, "could not register ac97 mixer\n");