Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: atmel/ac97c: using software reset instead hardware reset if not available
This commit is contained in:
commit
d5ed5e48f4
|
@ -899,6 +899,10 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip)
|
|||
/* AC97 v2.2 specifications says minimum 1 us. */
|
||||
udelay(2);
|
||||
gpio_set_value(chip->reset_pin, 1);
|
||||
} else {
|
||||
ac97c_writel(chip, MR, AC97C_MR_WRST | AC97C_MR_ENA);
|
||||
udelay(2);
|
||||
ac97c_writel(chip, MR, AC97C_MR_ENA);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue