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

Commit 00aeb429 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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""
parents 316d9679 df91bc23

sound/pci/hda/patch_realtek.c

+0 −1
Original line number Diff line number Diff line
@@ -6197,7 +6197,6 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG),

	SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG),

	SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG),

	SND_PCI_QUIRK(0x106b, 0x00a0, "Apple iMac 24''", ALC885_IMAC24),

	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG),

	SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8  */

	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),

sound/pci/oxygen/hifier.c

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#include <linux/delay.h>

#include <linux/pci.h>

#include <sound/control.h>

#include <sound/core.h>
@@ -107,6 +108,9 @@ static void set_ak4396_params(struct oxygen *chip, 
	else

		value |= AK4396_DFS_QUAD;

	data->ak4396_ctl2 = value;



	msleep(1); /* wait for the new MCLK to become stable */



	ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB);

	ak4396_write(chip, AK4396_CONTROL_2, value);

	ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);

sound/pci/oxygen/oxygen.c

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
 * GPIO 1 -> DFS1 of AK5385

 */



#include <linux/delay.h>

#include <linux/mutex.h>

#include <linux/pci.h>

#include <sound/ac97_codec.h>
@@ -213,6 +214,9 @@ static void set_ak4396_params(struct oxygen *chip, 
	else

		value |= AK4396_DFS_QUAD;

	data->ak4396_ctl2 = value;



	msleep(1); /* wait for the new MCLK to become stable */



	for (i = 0; i < 4; ++i) {

		ak4396_write(chip, i,

			     AK4396_CONTROL_1, AK4396_DIF_24_MSB);