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

Commit 03c850ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This update contains overall only driver-specific fixes.  Slightly
  large LOC are seen in usb-audio driver for a couple of new device
  quirks and cs42l71 ASoC driver for enhanced features.  The others are
  a few small (regression) fixes HD-audio, and yet other small / trival
  ASoC fixes."

* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Support for Digidesign Mbox 2 USB sound card:
  ALSA: HDA: Fix sound resume hang
  ALSA: hda - bug fix for invalid connection list of Haswell HDMI codec pins
  ALSA: hda - Fix the wrong pincaps set in ALC861VD dallas/hp fixup
  ALSA: hda - Set codec->single_adc_amp flag for Realtek codecs
  ASoC: atmel-ssc: change disable to disable in dts node
  ASoC: Prevent pop_wait overwrite
  ALSA: usb-audio: ignore-quirk for HP Wireless Audio
  ALSA: hda - Always turn on pins for HDMI/DP
  ALSA: hda - Fix pin configuration of HP Pavilion dv7
  ASoC: core: Fix splitting of log messages
  ASoC: cs42l73: Change VSPIN/VSPOUT to VSPINOUT
  ASoC: cs42l73: Add DAPM events for power down.
  ASoC: cs42l73: Add DMIC's as DAPM inputs.
  ASoC: sigmadsp: Fix endianness conversion issue
  ASoC: tpa6130a2: Use devm_* APIs
parents 85d5b70d cb99864d

arch/arm/boot/dts/at91sam9263.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -368,14 +368,14 @@ 
				compatible = "atmel,at91rm9200-ssc";

				reg = <0xfff98000 0x4000>;

				interrupts = <16 4 5>;

				status = "disable";

				status = "disabled";

			};



			ssc1: ssc@fff9c000 {

				compatible = "atmel,at91rm9200-ssc";

				reg = <0xfff9c000 0x4000>;

				interrupts = <17 4 5>;

				status = "disable";

				status = "disabled";

			};



			macb0: ethernet@fffbc000 {

arch/arm/boot/dts/at91sam9g45.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -425,14 +425,14 @@ 
				compatible = "atmel,at91sam9g45-ssc";

				reg = <0xfff9c000 0x4000>;

				interrupts = <16 4 5>;

				status = "disable";

				status = "disabled";

			};



			ssc1: ssc@fffa0000 {

				compatible = "atmel,at91sam9g45-ssc";

				reg = <0xfffa0000 0x4000>;

				interrupts = <17 4 5>;

				status = "disable";

				status = "disabled";

			};



			adc0: adc@fffb0000 {

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
				compatible = "atmel,at91sam9g45-ssc";

				reg = <0xf0010000 0x4000>;

				interrupts = <28 4 5>;

				status = "disable";

				status = "disabled";

			};



			tcb0: timer@f8008000 {

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ struct snd_soc_dai { 
	unsigned int symmetric_rates:1;

	struct snd_pcm_runtime *runtime;

	unsigned int active;

	unsigned char pop_wait:1;

	unsigned char probed:1;



	struct snd_soc_dapm_widget *playback_widget;

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,7 @@ struct snd_soc_pcm_runtime { 
	struct snd_soc_dpcm_runtime dpcm[2];



	long pmdown_time;

	unsigned char pop_wait:1;



	/* runtime devices */

	struct snd_pcm *pcm;