From 2d7e686383bf8f0b64ae5ef7aeb85107d5e52d6b Mon Sep 17 00:00:00 2001 From: Hans-Christian Egtvedt Date: Thu, 2 Apr 2009 08:21:15 +0200 Subject: [PATCH] --- yaml --- r: 142713 b: refs/heads/master c: 81baf3a7f686c5d22359cb06fc11d20907ba12f8 h: refs/heads/master i: 142711: 3d3ff7cf791d86dffd0555a28b28f64fdf3bebd5 v: v3 --- [refs] | 2 +- trunk/sound/atmel/ac97c.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7a00cccfa13b..47f2eecbae9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df163587eab15a24cc34cf8434a5657416f8a203 +refs/heads/master: 81baf3a7f686c5d22359cb06fc11d20907ba12f8 diff --git a/trunk/sound/atmel/ac97c.c b/trunk/sound/atmel/ac97c.c index e8484cb9ac62..90527c14901e 100644 --- a/trunk/sound/atmel/ac97c.c +++ b/trunk/sound/atmel/ac97c.c @@ -730,17 +730,17 @@ static bool filter(struct dma_chan *chan, void *slave) 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)) { gpio_set_value(chip->reset_pin, 0); /* AC97 v2.2 specifications says minimum 1 us. */ - udelay(10); + udelay(2); 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) @@ -826,6 +826,8 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev) snd_card_set_dev(card, &pdev->dev); + atmel_ac97c_reset(chip); + /* Enable overrun interrupt from codec channel */ ac97c_writel(chip, COMR, AC97C_CSR_OVRUN); 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; } - atmel_ac97c_reset(chip); - retval = atmel_ac97c_mixer_new(chip); if (retval) { dev_dbg(&pdev->dev, "could not register ac97 mixer\n");