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

Commit 9a7e4f56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This batch ended up as a relatively high volume due to pending ASoC
  fixes.  But most of fixes there are trivial and/or device- specific
  fixes and quirks, so safe to apply.  The only (ASoC) core fixes are
  the DPCM race fix and the machine-driver matching fix for
  componentization"

* tag 'sound-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - fix the mic mute led problem for Latitude E5550
  ALSA: hda - move DELL_WMI_MIC_MUTE_LED to the tail in the quirk chain
  ASoC: wm_adsp: Avoid attempt to free buffers that might still be in use
  ALSA: usb-audio: Set the Control Selector to SU_SELECTOR_CONTROL for UAC2
  ALSA: usb-audio: Add ctrl message delay quirk for Marantz/Denon devices
  ASoC: sgtl5000: Fix SMALL_POP bit definition
  ASoC: cs42l51: re-hook of_match_table pointer
  ASoC: rt5670: change dapm routes of PLL connection
  ASoC: rt5670: correct the incorrect default values
  ASoC: samsung: Add MODULE_DEVICE_TABLE for Snow
  ASoC: max98090: Correct pclk divisor settings
  ASoC: dpcm: Fix race between FE/BE updates and trigger
  ASoC: Fix snd_soc_find_dai() matching component by name
  ASoC: rsnd: remove unsupported PAUSE flag
  ASoC: fsi: remove unsupported PAUSE flag
  ASoC: rt5645: Mark RT5645_TDM_CTRL_3 as readable
  ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrl
  ASoC: es8328-i2c: Fix i2c_device_id name field in es8328_id
  ASoC: fsl_asrc: Add reg_defaults for regmap to fix kernel dump
parents f100a746 6676f308

include/sound/soc-dpcm.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ struct snd_soc_dpcm_runtime { 
	/* state and update */

	enum snd_soc_dpcm_update runtime_update;

	enum snd_soc_dpcm_state state;



	int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */

};



/* can this BE stop and free */

sound/pci/hda/patch_realtek.c

+4 −4
Original line number Diff line number Diff line
@@ -4520,6 +4520,8 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC269_FIXUP_HEADSET_MODE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mode,

		.chained = true,

		.chain_id = ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED

	},

	[ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC] = {

		.type = HDA_FIXUP_FUNC,
@@ -4709,6 +4711,8 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC255_FIXUP_HEADSET_MODE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mode_alc255,

		.chained = true,

		.chain_id = ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED

	},

	[ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC] = {

		.type = HDA_FIXUP_FUNC,
@@ -4744,8 +4748,6 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_dell_wmi,

		.chained_before = true,

		.chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE

	},

	[ALC282_FIXUP_ASPIRE_V5_PINS] = {

		.type = HDA_FIXUP_PINS,
@@ -4783,10 +4785,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x05f4, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

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

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

	SND_PCI_QUIRK(0x1028, 0x0610, "Dell", ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED),

	SND_PCI_QUIRK(0x1028, 0x0615, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK),

	SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK),

	SND_PCI_QUIRK(0x1028, 0x061f, "Dell", ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED),

	SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK),

	SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

sound/soc/codecs/cs42l51-i2c.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static struct i2c_driver cs42l51_i2c_driver = { 
	.driver = {

		.name = "cs42l51",

		.owner = THIS_MODULE,

		.of_match_table = cs42l51_of_match,

	},

	.probe = cs42l51_i2c_probe,

	.remove = cs42l51_i2c_remove,

sound/soc/codecs/cs42l51.c

+3 −1
Original line number Diff line number Diff line
@@ -558,11 +558,13 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) 
}

EXPORT_SYMBOL_GPL(cs42l51_probe);



static const struct of_device_id cs42l51_of_match[] = {

const struct of_device_id cs42l51_of_match[] = {

	{ .compatible = "cirrus,cs42l51", },

	{ }

};

MODULE_DEVICE_TABLE(of, cs42l51_of_match);

EXPORT_SYMBOL_GPL(cs42l51_of_match);



MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");

MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver");

MODULE_LICENSE("GPL");

sound/soc/codecs/cs42l51.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct device; 


extern const struct regmap_config cs42l51_regmap;

int cs42l51_probe(struct device *dev, struct regmap *regmap);

extern const struct of_device_id cs42l51_of_match[];



#define CS42L51_CHIP_ID			0x1B

#define CS42L51_CHIP_REV_A		0x00