Commit cba5a641 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.14rc3
  [ALSA] cmipci - Allow to disable integrated FM port
  [ALSA] hda-codec - Fix logic error in headphone mute for Conexant codecs
  [ALSA] hda-codec - Add missing Mic Boost for AD1986A codec
  [ALSA] ac97 - Add Thinkpad X31 and R40 to AD1981x blacklist
  [ALSA] Add missing sysfs device assignment for ALSA PCI drivers
  [ALSA] hda-codec - Define pin configs for MacBooks
  [ALSA] hda-codec - Add missing Mic Boost controls for ALC262
  [ALSA] soc - WM9712 PCM volume
  [ALSA] soc - Fix WM9712 register cache entry
  [ALSA] hda-codec - Add method for configuring Mac Pro without PCI SSID
  [ALSA] hda-codec - Add LFE support on Dell M90
parents 9f6632d6 6185af1f

Documentation/sound/alsa/ALSA-Configuration.txt

+10 −2
Original line number Diff line number Diff line
@@ -370,7 +370,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    mpu_port	- 0x300,0x310,0x320,0x330 = legacy port,

		  1 = integrated PCI port,

		  0 = disable (default)

    fm_port     - 0x388 (default), 0 = disable (default)

    fm_port     - 0x388 = legacy port,

		  1 = integrated PCI port (default),

		  0 = disable

    soft_ac3    - Software-conversion of raw SPDIF packets (model 033 only)

                  (default = 1)

    joystick_port - Joystick port address (0 = disable, 1 = auto-detect)
@@ -895,10 +897,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
			can be adjusted.  Appearing only when compiled with

			$CONFIG_SND_DEBUG=y



	STAC9200/9205/9220/9221/9254

	STAC9200/9205/9254

	  ref		Reference board



	STAC9220/9221

	  ref		Reference board

	  3stack	D945 3stack

	  5stack	D945 5stack + SPDIF

	  macmini	Intel Mac Mini

	  macbook	Intel Mac Book

	  macbook-pro	Intel Mac Book Pro



	STAC9202/9250/9251

	  ref		Reference board, base config

include/sound/version.h

+2 −2
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.14rc2"

#define CONFIG_SND_DATE " (Wed Feb 14 07:42:13 2007 UTC)"
 
#define CONFIG_SND_VERSION "1.0.14rc3"

#define CONFIG_SND_DATE " (Tue Mar 06 13:10:00 2007 UTC)"

sound/pci/ac97/ac97_patch.c

+2 −0
Original line number Diff line number Diff line
@@ -1790,6 +1790,8 @@ static const struct snd_kcontrol_new snd_ac97_ad1981x_jack_sense[] = { 
 * (SS vendor << 16 | device)

 */

static unsigned int ad1981_jacks_blacklist[] = {

	0x10140523, /* Thinkpad R40 */

	0x10140534, /* Thinkpad X31 */

	0x10140537, /* Thinkpad T41p */

	0x10140554, /* Thinkpad T42p/R50p */

	0 /* end */

sound/pci/ali5451/ali5451.c

+2 −0
Original line number Diff line number Diff line
@@ -2312,6 +2312,8 @@ static int __devinit snd_ali_create(struct snd_card *card, 
		return err;

	}



	snd_card_set_dev(card, &pci->dev);



	/* initialise synth voices*/

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

		codec->synth.voices[i].number = i;

sound/pci/cmipci.c

+11 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ 
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */

static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable switches */

static long mpu_port[SNDRV_CARDS];

static long fm_port[SNDRV_CARDS];

static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};

static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};

#ifdef SUPPORT_JOYSTICK

static int joystick_port[SNDRV_CARDS];
@@ -2779,6 +2779,9 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port) 
	struct snd_opl3 *opl3;

	int err;



	if (!fm_port)

		goto disable_fm;



	/* first try FM regs in PCI port range */

	iosynth = cm->iobase + CM_REG_FM_PCI;

	err = snd_opl3_create(cm->card, iosynth, iosynth + 2,
@@ -2793,7 +2796,7 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port) 
		case 0x3C8: val |= CM_FMSEL_3C8; break;

		case 0x388: val |= CM_FMSEL_388; break;

		default:

			    return 0;

			goto disable_fm;

		}

		snd_cmipci_write(cm, CM_REG_LEGACY_CTRL, val);

		/* enable FM */
@@ -2803,11 +2806,7 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port) 
				    OPL3_HW_OPL3, 0, &opl3) < 0) {

			printk(KERN_ERR "cmipci: no OPL device at %#lx, "

			       "skipping...\n", iosynth);

			/* disable FM */

			snd_cmipci_write(cm, CM_REG_LEGACY_CTRL,

					 val & ~CM_FMSEL_MASK);

			snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_FM_EN);

			return 0;

			goto disable_fm;

		}

	}

	if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
@@ -2815,6 +2814,11 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port) 
		return err;

	}

	return 0;



 disable_fm:

	snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_FMSEL_MASK);

	snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_FM_EN);

	return 0;

}



static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pci,

CRA Git | Maintained and supported by SUSTech CRA and CCSE