Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: oxygen: fix distorted output on AK4396-based cards
Revert "ALSA: hda - Added model selection for iMac 24""
-1
sound/pci/hda/patch_realtek.c
-1
sound/pci/hda/patch_realtek.c
···
6197
SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),
6198
SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),
6199
SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),
6200
-
SND_PCI_QUIRK(0x106b, 0x00a0, "Apple iMac 24''", ALC885_IMAC24),
6201
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),
6202
SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */
6203
SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),
···
6197
SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),
6198
SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),
6199
SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),
6200
SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),
6201
SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */
6202
SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),
+4
sound/pci/oxygen/hifier.c
+4
sound/pci/oxygen/hifier.c
···
17
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
*/
19
20
#include <linux/pci.h>
21
#include <sound/control.h>
22
#include <sound/core.h>
···
108
else
109
value |= AK4396_DFS_QUAD;
110
data->ak4396_ctl2 = value;
111
ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB);
112
ak4396_write(chip, AK4396_CONTROL_2, value);
113
ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
···
17
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
*/
19
20
+
#include <linux/delay.h>
21
#include <linux/pci.h>
22
#include <sound/control.h>
23
#include <sound/core.h>
···
107
else
108
value |= AK4396_DFS_QUAD;
109
data->ak4396_ctl2 = value;
110
+
111
+
msleep(1); /* wait for the new MCLK to become stable */
112
+
113
ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB);
114
ak4396_write(chip, AK4396_CONTROL_2, value);
115
ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
+4
sound/pci/oxygen/oxygen.c
+4
sound/pci/oxygen/oxygen.c
···
28
* GPIO 1 -> DFS1 of AK5385
29
*/
30
31
#include <linux/mutex.h>
32
#include <linux/pci.h>
33
#include <sound/ac97_codec.h>
···
214
else
215
value |= AK4396_DFS_QUAD;
216
data->ak4396_ctl2 = value;
217
for (i = 0; i < 4; ++i) {
218
ak4396_write(chip, i,
219
AK4396_CONTROL_1, AK4396_DIF_24_MSB);
···
28
* GPIO 1 -> DFS1 of AK5385
29
*/
30
31
+
#include <linux/delay.h>
32
#include <linux/mutex.h>
33
#include <linux/pci.h>
34
#include <sound/ac97_codec.h>
···
213
else
214
value |= AK4396_DFS_QUAD;
215
data->ak4396_ctl2 = value;
216
+
217
+
msleep(1); /* wait for the new MCLK to become stable */
218
+
219
for (i = 0; i < 4; ++i) {
220
ak4396_write(chip, i,
221
AK4396_CONTROL_1, AK4396_DIF_24_MSB);