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

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

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

Pull sound fixes from Takashi Iwai:
 "This became a relative big update as it includes the collected ASoC
  fixes.  There are a few fixes in ASoC core side, mostly for DAPM and
  the new topology API.  The rest are various ASoC driver-specific
  fixes, as well as the usual HD-audio and USB-audio quirks"

* tag 'sound-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits)
  ALSA: hda - Fix MacBook Pro 5,2 quirk
  ALSA: hda - Fix race between PM ops and HDA init/probe
  ALSA: usb-audio: add dB range mapping for some devices
  ALSA: hda - Apply a fixup to Dell Vostro 5480
  ALSA: hda - Add pin quirk for the headset mic jack detection on Dell laptop
  ALSA: hda - Apply fixup for another Toshiba Satellite S50D
  ALSA: fireworks: add support for AudioFire2 quirk
  ALSA: hda - Fix the headset mic that will not work on Dell desktop machine
  ALSA: hda - fix cs4210_spdif_automute()
  ASoC: pcm1681: Fix setting de-emphasis sampling rate selection
  ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt
  ASoC: sgtl5000: Fix up define for SGTL5000_SMALL_POP
  ASoC: dapm: Don't add prefix to widget stream name
  ASoC: rt5645: Check if codec is initialized in workqueue handler
  ASoC: Intel: Get correct usage_count value to load firmware
  ASoC: topology: Fix to add dapm mixer info
  ASoC: zx: spdif: Fix devm_ioremap_resource return value check
  ASoC: zx: i2s: Fix devm_ioremap_resource return value check
  ASoC: mediatek: Use platform_of_node for machine drivers
  ASoC: Free card DAPM context on snd_soc_instantiate_card() error path
  ...
parents 5e49e0be 649ccd08

Documentation/devicetree/bindings/sound/mt8173-max98090.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ MT8173 with MAX98090 CODEC 
Required properties:

- compatible : "mediatek,mt8173-max98090"

- mediatek,audio-codec: the phandle of the MAX98090 audio codec

- mediatek,platform: the phandle of MT8173 ASoC platform



Example:



	sound {

		compatible = "mediatek,mt8173-max98090";

		mediatek,audio-codec = <&max98090>;

		mediatek,platform = <&afe>;

	};

Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ MT8173 with RT5650 RT5676 CODECS 
Required properties:

- compatible : "mediatek,mt8173-rt5650-rt5676"

- mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs

- mediatek,platform: the phandle of MT8173 ASoC platform



Example:



	sound {

		compatible = "mediatek,mt8173-rt5650-rt5676";

		mediatek,audio-codec = <&rt5650 &rt5676>;

		mediatek,platform = <&afe>;

	};

include/uapi/sound/asoc.h

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 


/*

 * Block Header.

 * This header preceeds all object and object arrays below.

 * This header precedes all object and object arrays below.

 */

struct snd_soc_tplg_hdr {

	__le32 magic;		/* magic number */
@@ -222,7 +222,7 @@ struct snd_soc_tplg_stream_config { 
/*

 * Manifest. List totals for each payload type. Not used in parsing, but will

 * be passed to the component driver before any other objects in order for any

 * global componnent resource allocations.

 * global component resource allocations.

 *

 * File block representation for manifest :-

 * +-----------------------------------+----+

sound/firewire/fireworks/fireworks.c

+2 −0
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ efw_probe(struct fw_unit *unit, 
	err = get_hardware_info(efw);

	if (err < 0)

		goto error;

	if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2)

		efw->is_af2 = true;

	if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9)

		efw->is_af9 = true;

sound/firewire/fireworks/fireworks.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct snd_efw { 
	bool resp_addr_changable;



	/* for quirks */

	bool is_af2;

	bool is_af9;

	u32 firmware_version;