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

Commit 8f710dd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A fairly calm update at this time, as seen in the short log, only one
  fix per person: including,

   - a few ASoC fixes (da7213 dmic, ux500 AD slot, wm0010 error path)
   - a copule of HD-audio fixes
   - a few other misc fixes (MIPS allmodconfig, proc output in usb, old
     PowerBook support)"

* tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: proc: use found syncmaxsize to determine feedback format
  ALSA: hda - Add headset mic support for another Dell machine
  ALSA: snd-aoa: Add a layout entry for PowerBook6,5
  ALSA: hda - Check the activity of the NID to be powered down
  sound: Fix make allmodconfig on MIPS correctly
  ASoC: da7213: Fix setting dmic_samplephase and dmic_clk_rate
  ASoC: ux500: Swap even/odd AD slot definitions
  ASoC: wm0010: fix error return code in wm0010_boot()
parents ec50f2a9 e6135fe9

sound/aoa/fabrics/layout.c

+8 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ MODULE_ALIAS("sound-layout-100"); 
MODULE_ALIAS("aoa-device-id-14");

MODULE_ALIAS("aoa-device-id-22");

MODULE_ALIAS("aoa-device-id-35");

MODULE_ALIAS("aoa-device-id-44");



/* onyx with all but microphone connected */

static struct codec_connection onyx_connections_nomic[] = {
@@ -361,6 +362,13 @@ static struct layout layouts[] = { 
		.connections = tas_connections_nolineout,

	  },

	},

	/* PowerBook6,5 */

	{ .device_id = 44,

	  .codecs[0] = {

		.name = "tas",

		.connections = tas_connections_all,

	  },

	},

	/* PowerBook6,7 */

	{ .layout_id = 80,

	  .codecs[0] = {

sound/aoa/soundbus/i2sbus/core.c

+2 −1
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ static int i2sbus_add_dev(struct macio_dev *macio, 
			 * We probably cannot handle all device-id machines,

			 * so restrict to those we do handle for now.

			 */

			if (id && (*id == 22 || *id == 14 || *id == 35)) {

			if (id && (*id == 22 || *id == 14 || *id == 35 ||

				   *id == 44)) {

				snprintf(dev->sound.modalias, 32,

					 "aoa-device-id-%d", *id);

				ok = 1;

sound/oss/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ config MSND_FIFOSIZE 
menuconfig SOUND_OSS

	tristate "OSS sound modules"

	depends on ISA_DMA_API && VIRT_TO_BUS

	depends on !ISA_DMA_SUPPORT_BROKEN

	depends on !GENERIC_ISA_DMA_SUPPORT_BROKEN

	help

	  OSS is the Open Sound System suite of sound card drivers.  They make

	  sound programming easier since they provide a common API.  Say Y or

sound/pci/hda/hda_generic.c

+7 −2
Original line number Diff line number Diff line
@@ -606,6 +606,10 @@ static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid, 
	return false;

}



/* check whether the NID is referred by any active paths */

#define is_active_nid_for_any(codec, nid) \

	is_active_nid(codec, nid, HDA_OUTPUT, 0)



/* get the default amp value for the target state */

static int get_amp_val_to_activate(struct hda_codec *codec, hda_nid_t nid,

				   int dir, unsigned int caps, bool enable)
@@ -759,7 +763,8 @@ static void path_power_down_sync(struct hda_codec *codec, struct nid_path *path) 


	for (i = 0; i < path->depth; i++) {

		hda_nid_t nid = path->path[i];

		if (!snd_hda_check_power_state(codec, nid, AC_PWRST_D3)) {

		if (!snd_hda_check_power_state(codec, nid, AC_PWRST_D3) &&

		    !is_active_nid_for_any(codec, nid)) {

			snd_hda_codec_write(codec, nid, 0,

					    AC_VERB_SET_POWER_STATE,

					    AC_PWRST_D3);
@@ -4157,7 +4162,7 @@ static unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, 
		return power_state;

	if (get_wcaps_type(get_wcaps(codec, nid)) >= AC_WID_POWER)

		return power_state;

	if (is_active_nid(codec, nid, HDA_OUTPUT, 0))

	if (is_active_nid_for_any(codec, nid))

		return power_state;

	return AC_PWRST_D3;

}

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -3482,6 +3482,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x05c9, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05ca, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05cb, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05de, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05e9, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05ea, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05eb, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),