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

Commit 8b940fc4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents 19723079 25d7d59d

Documentation/sound/alsa/HD-Audio.txt

+4 −4
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ Development Tree 
~~~~~~~~~~~~~~~~

The latest development codes for HD-audio are found on sound git tree:



- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git



The master branch or for-next branches can be used as the main

development branches in general while the HD-audio specific patches
@@ -594,7 +594,7 @@ is, installed via the usual spells: configure, make and make 
install(-modules).  See INSTALL in the package.  The snapshot tarballs

are found at:



- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/

- ftp://ftp.suse.com/pub/people/tiwai/snapshot/





Sending a Bug Report
@@ -696,7 +696,7 @@ via hda-verb won't change the mixer value. 


The hda-verb program is found in the ftp directory:



- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/

- ftp://ftp.suse.com/pub/people/tiwai/misc/



Also a git repository is available:
@@ -764,7 +764,7 @@ operation, the jack plugging simulation, etc. 


The package is found in:



- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/

- ftp://ftp.suse.com/pub/people/tiwai/misc/



A git repository is available:

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6122,7 +6122,7 @@ F: sound/ 
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported

include/linux/mfd/wm8994/registers.h

+15 −0
Original line number Diff line number Diff line
@@ -1962,6 +1962,21 @@ 
#define WM8958_MICB2_DISCH_SHIFT                     0  /* MICB2_DISCH */

#define WM8958_MICB2_DISCH_WIDTH                     1  /* MICB2_DISCH */



/*

 * R210 (0xD2) - Mic Detect 3

 */

#define WM8958_MICD_LVL_MASK                    0x07FC  /* MICD_LVL - [10:2] */

#define WM8958_MICD_LVL_SHIFT                        2  /* MICD_LVL - [10:2] */

#define WM8958_MICD_LVL_WIDTH                        9  /* MICD_LVL - [10:2] */

#define WM8958_MICD_VALID                       0x0002  /* MICD_VALID */

#define WM8958_MICD_VALID_MASK                  0x0002  /* MICD_VALID */

#define WM8958_MICD_VALID_SHIFT                      1  /* MICD_VALID */

#define WM8958_MICD_VALID_WIDTH                      1  /* MICD_VALID */

#define WM8958_MICD_STS                         0x0001  /* MICD_STS */

#define WM8958_MICD_STS_MASK                    0x0001  /* MICD_STS */

#define WM8958_MICD_STS_SHIFT                        0  /* MICD_STS */

#define WM8958_MICD_STS_WIDTH                        1  /* MICD_STS */



/*

 * R76 (0x4C) - Charge Pump (1)

 */

sound/pci/hda/hda_eld.c

+9 −4
Original line number Diff line number Diff line
@@ -297,10 +297,18 @@ static int hdmi_update_eld(struct hdmi_eld *e, 
					buf + ELD_FIXED_BYTES + mnl + 3 * i);

	}



	/*

	 * HDMI sink's ELD info cannot always be retrieved for now, e.g.

	 * in console or for audio devices. Assume the highest speakers

	 * configuration, to _not_ prohibit multi-channel audio playback.

	 */

	if (!e->spk_alloc)

		e->spk_alloc = 0xffff;



	e->eld_valid = true;

	return 0;



out_fail:

	e->eld_ver = 0;

	return -EINVAL;

}
@@ -323,9 +331,6 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, 
	 * ELD is valid, actual eld_size is assigned in hdmi_update_eld()

	 */



	if (!eld->eld_valid)

		return -ENOENT;



	size = snd_hdmi_get_eld_size(codec, nid);

	if (size == 0) {

		/* wfg: workaround for ASUS P5E-VM HDMI board */

sound/pci/hda/hda_local.h

+3 −0
Original line number Diff line number Diff line
@@ -653,6 +653,9 @@ struct hdmi_eld { 
	int	spk_alloc;

	int	sad_count;

	struct cea_sad sad[ELD_MAX_SAD];

	/*

	 * all fields above eld_buffer will be cleared before updating ELD

	 */

	char    eld_buffer[ELD_MAX_SIZE];

#ifdef CONFIG_PROC_FS

	struct snd_info_entry *proc_entry;