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

Commit 0fc04f91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "At this time, most of changes are for ASoC, while we got one fix for
  yet another race of ALSA sequencer core and a usual HD-audio quirk.

  The ASoC changes are mostly small and device-specific fixes. A
  slightly large volume is seen in sun8i-codec, which is a new code in
  4.11, and we'd like to fix user-visible stuff before the official 4.1
  release"

* tag 'sound-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (27 commits)
  ALSA: hda - fix a problem for lineout on a Dell AIO machine
  ASoC: simple-card: fix simple_dai clk lookup
  ASoC: STI: Fix reader substream pointer set
  ALSA: seq: Fix race during FIFO resize
  ARM: dts: sun8i: Update audio-routing with renamed widgets
  ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN
  ASoC: sun8i-codec: Fix space on audio-routing widget
  ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE
  ASoC: sun8i-codec: Remove analog "HP" widget
  ASoC: rt5665: fix wrong shift rt5665_if2_1_adc_in_enum
  ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X
  ASoC: rcar: dma: remove unnecessary "volatile"
  ASoC: rcar: clear DE bit only in PDMACHCR when it stops
  ASoC: rsnd: fix sound route path when using SRC6/SRC9
  ASoC: don't dereference NULL pcm_{new,free}
  ASoC: rt5665: CLKDET is also a power of ASRC
  ASoC: rt5665: Vref3 is necessary for Mono Amp
  ASoC: rt5665: increase LDO level
  ASoC: rt5665: fix getting wrong work handler container
  ASoC: atmel-classd: fix audio clock rate
  ...
parents eee551df 2f726aec

arch/arm/boot/dts/sun8i-a33.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ 
		simple-audio-card,mclk-fs = <512>;

		simple-audio-card,aux-devs = <&codec_analog>;

		simple-audio-card,routing =

			"Left DAC", "Digital Left DAC",

			"Right DAC", "Digital Right DAC";

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right";

		status = "disabled";



		simple-audio-card,cpu {

sound/core/seq/seq_fifo.c

+4 −0
Original line number Diff line number Diff line
@@ -267,6 +267,10 @@ int snd_seq_fifo_resize(struct snd_seq_fifo *f, int poolsize) 
	/* NOTE: overflow flag is not cleared */

	spin_unlock_irqrestore(&f->lock, flags);



	/* close the old pool and wait until all users are gone */

	snd_seq_pool_mark_closing(oldpool);

	snd_use_lock_sync(&f->use_lock);



	/* release cells in old pool */

	for (cell = oldhead; cell; cell = next) {

		next = cell->next;

sound/pci/hda/patch_realtek.c

+11 −1
Original line number Diff line number Diff line
@@ -4858,6 +4858,7 @@ enum { 
	ALC292_FIXUP_DISABLE_AAMIX,

	ALC293_FIXUP_DISABLE_AAMIX_MULTIJACK,

	ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,

	ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE,

	ALC275_FIXUP_DELL_XPS,

	ALC256_FIXUP_DELL_XPS_13_HEADPHONE_NOISE,

	ALC293_FIXUP_LENOVO_SPK_NOISE,
@@ -5470,6 +5471,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE

	},

	[ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */

			{ }

		},

		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE

	},

	[ALC275_FIXUP_DELL_XPS] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {
@@ -5542,7 +5552,7 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc298_fixup_speaker_volume,

		.chained = true,

		.chain_id = ALC298_FIXUP_DELL1_MIC_NO_PRESENCE,

		.chain_id = ALC298_FIXUP_DELL_AIO_MIC_NO_PRESENCE,

	},

	[ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {

		.type = HDA_FIXUP_PINS,

sound/soc/atmel/atmel-classd.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int atmel_classd_codec_dai_digital_mute(struct snd_soc_dai *codec_dai, 
}



#define CLASSD_ACLK_RATE_11M2896_MPY_8 (112896 * 100 * 8)

#define CLASSD_ACLK_RATE_12M288_MPY_8  (12228 * 1000 * 8)

#define CLASSD_ACLK_RATE_12M288_MPY_8  (12288 * 1000 * 8)



static struct {

	int rate;

sound/soc/codecs/hdac_hdmi.c

+8 −8
Original line number Diff line number Diff line
@@ -1534,23 +1534,22 @@ static void hdac_hdmi_eld_notify_cb(void *aptr, int port, int pipe) 
			pin->mst_capable = false;

			/* if not MST, default is port[0] */

			hport = &pin->ports[0];

			goto out;

		} else {

			for (i = 0; i < pin->num_ports; i++) {

				pin->mst_capable = true;

				if (pin->ports[i].id == pipe) {

					hport = &pin->ports[i];

					goto out;

				}

					break;

				}

			}

		}



out:

	if (pin && hport)

		if (hport)

			hdac_hdmi_present_sense(pin, hport);

	}



}



static struct i915_audio_component_audio_ops aops = {

	.pin_eld_notify	= hdac_hdmi_eld_notify_cb,

};
@@ -1998,7 +1997,7 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev) 
	struct hdac_hdmi_pin *pin, *pin_next;

	struct hdac_hdmi_cvt *cvt, *cvt_next;

	struct hdac_hdmi_pcm *pcm, *pcm_next;

	struct hdac_hdmi_port *port;

	struct hdac_hdmi_port *port, *port_next;

	int i;



	snd_soc_unregister_codec(&edev->hdac.dev);
@@ -2008,8 +2007,9 @@ static int hdac_hdmi_dev_remove(struct hdac_ext_device *edev) 
		if (list_empty(&pcm->port_list))

			continue;



		list_for_each_entry(port, &pcm->port_list, head)

			port = NULL;

		list_for_each_entry_safe(port, port_next,

					&pcm->port_list, head)

			list_del(&port->head);



		list_del(&pcm->head);

		kfree(pcm);