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

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

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

Pull second set of sound fixes from Takashi Iwai:
 "A collection of small fixes in HD-audio quirks and runtime PM, ASoC
  rcar, abs8500 and other codecs.  Most of commits are for stable
  kernels, too"

* tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial)
  ALSA: hda - Provide missing pin configs for VAIO with ALC260
  ALSA: hda - Add headset quirk for Dell Inspiron 3135
  ALSA: hda - Fix the headphone jack detection on Sony VAIO TX
  ALSA: hda - Fix missing bass speaker on ASUS N550
  ALSA: hda - Fix unbalanced runtime PM notification at resume
  ASoC: arizona: Set FLL to free-run before disabling
  ALSA: hda - A casual Dell Headset quirk
  ASoC: rcar: fixup dma_async_issue_pending() timing
  ASoC: rcar: off by one in rsnd_scu_set_route()
  ASoC: wm5110: Add post SYSCLK register patch for rev D chip
  ASoC: ab8500: Revert to using custom I/O functions
  ALSA: hda - Also enable mute/micmute LED control for "Lenovo dock" fixup
  ALSA: firewire-lib: include sound/asound.h to refer to snd_pcm_format_t
  ALSA: hda - Select FW_LOADER from CONFIG_SND_HDA_CODEC_CA0132_DSP
  ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Realtek codec
  ASoC: rcar: fixup mod access before checking
parents aecde27c 5db4d34b

sound/firewire/amdtp.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/mutex.h>

#include <sound/asound.h>

#include "packets-buffer.h"



/**

sound/pci/hda/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -209,8 +209,9 @@ config SND_HDA_CODEC_CA0132 


config SND_HDA_CODEC_CA0132_DSP

	bool "Support new DSP code for CA0132 codec"

	depends on SND_HDA_CODEC_CA0132 && FW_LOADER

	depends on SND_HDA_CODEC_CA0132

	select SND_HDA_DSP_LOADER

	select FW_LOADER

	help

	  Say Y here to enable the DSP for Creative CA0132 for extended

	  features like equalizer or echo cancellation.

sound/pci/hda/hda_codec.c

+4 −0
Original line number Diff line number Diff line
@@ -4000,6 +4000,10 @@ static void hda_call_codec_resume(struct hda_codec *codec) 
	 * in the resume / power-save sequence

	 */

	hda_keep_power_on(codec);

	if (codec->pm_down_notified) {

		codec->pm_down_notified = 0;

		hda_call_pm_notify(codec->bus, true);

	}

	hda_set_power_state(codec, AC_PWRST_D0);

	restore_shutup_pins(codec);

	hda_exec_init_verbs(codec);

sound/pci/hda/patch_realtek.c

+68 −4
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ enum { 
	ALC260_FIXUP_KN1,

	ALC260_FIXUP_FSC_S7020,

	ALC260_FIXUP_FSC_S7020_JWSE,

	ALC260_FIXUP_VAIO_PINS,

};



static void alc260_gpio1_automute(struct hda_codec *codec)
@@ -1652,6 +1653,24 @@ static const struct hda_fixup alc260_fixups[] = { 
		.chained = true,

		.chain_id = ALC260_FIXUP_FSC_S7020,

	},

	[ALC260_FIXUP_VAIO_PINS] = {

		.type = HDA_FIXUP_PINS,

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

			/* Pin configs are missing completely on some VAIOs */

			{ 0x0f, 0x01211020 },

			{ 0x10, 0x0001003f },

			{ 0x11, 0x411111f0 },

			{ 0x12, 0x01a15930 },

			{ 0x13, 0x411111f0 },

			{ 0x14, 0x411111f0 },

			{ 0x15, 0x411111f0 },

			{ 0x16, 0x411111f0 },

			{ 0x17, 0x411111f0 },

			{ 0x18, 0x411111f0 },

			{ 0x19, 0x411111f0 },

			{ }

		}

	},

};



static const struct snd_pci_quirk alc260_fixup_tbl[] = {
@@ -1660,6 +1679,8 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_FIXUP_GPIO1),

	SND_PCI_QUIRK(0x103c, 0x280a, "HP dc5750", ALC260_FIXUP_HP_DC5750),

	SND_PCI_QUIRK(0x103c, 0x30ba, "HP Presario B1900", ALC260_FIXUP_HP_B1900),

	SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_FIXUP_VAIO_PINS),

	SND_PCI_QUIRK(0x104d, 0x81e2, "Sony VAIO TX", ALC260_FIXUP_HP_PIN_0F),

	SND_PCI_QUIRK(0x10cf, 0x1326, "FSC LifeBook S7020", ALC260_FIXUP_FSC_S7020),

	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FIXUP_GPIO1),

	SND_PCI_QUIRK(0x152d, 0x0729, "Quanta KN1", ALC260_FIXUP_KN1),
@@ -3393,7 +3414,7 @@ static void alc_update_headset_mode_hook(struct hda_codec *codec, 
static void alc_update_headset_jack_cb(struct hda_codec *codec, struct hda_jack_tbl *jack)

{

	struct alc_spec *spec = codec->spec;

	spec->current_headset_type = ALC_HEADSET_MODE_UNKNOWN;

	spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;

	snd_hda_gen_hp_automute(codec, jack);

}
@@ -3652,9 +3673,29 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec, 
#if IS_ENABLED(CONFIG_THINKPAD_ACPI)



#include <linux/thinkpad_acpi.h>

#include <acpi/acpi.h>



static int (*led_set_func)(int, bool);



static acpi_status acpi_check_cb(acpi_handle handle, u32 lvl, void *context,

				 void **rv)

{

	bool *found = context;

	*found = true;

	return AE_OK;

}



static bool is_thinkpad(struct hda_codec *codec)

{

	bool found = false;

	if (codec->subsystem_id >> 16 != 0x17aa)

		return false;

	if (ACPI_SUCCESS(acpi_get_devices("LEN0068", acpi_check_cb, &found, NULL)) && found)

		return true;

	found = false;

	return ACPI_SUCCESS(acpi_get_devices("IBM0068", acpi_check_cb, &found, NULL)) && found;

}



static void update_tpacpi_mute_led(void *private_data, int enabled)

{

	if (led_set_func)
@@ -3680,6 +3721,8 @@ static void alc_fixup_thinkpad_acpi(struct hda_codec *codec, 
	bool removefunc = false;



	if (action == HDA_FIXUP_ACT_PROBE) {

		if (!is_thinkpad(codec))

			return;

		if (!led_set_func)

			led_set_func = symbol_request(tpacpi_led_set);

		if (!led_set_func) {
@@ -3923,6 +3966,8 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_pincfg_no_hp_to_lineout,

		.chained = true,

		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,

	},

	[ALC269_FIXUP_DELL1_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,
@@ -4027,6 +4072,8 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC269_FIXUP_LIMIT_INT_MIC_BOOST] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,

		.chained = true,

		.chain_id = ALC269_FIXUP_THINKPAD_ACPI,

	},

	[ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = {

		.type = HDA_FIXUP_FUNC,
@@ -4070,8 +4117,6 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC269_FIXUP_THINKPAD_ACPI] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_thinkpad_acpi,

		.chained = true,

		.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST

	},

	[ALC255_FIXUP_DELL1_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,
@@ -4128,6 +4173,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

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

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

	SND_PCI_QUIRK(0x1028, 0x0614, "Dell Inspiron 3135", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),

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

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

	SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -4173,7 +4219,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x5013, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC),
@@ -4181,6 +4227,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", ALC269_FIXUP_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */



#if 0
@@ -4698,6 +4745,8 @@ enum { 
	ALC668_FIXUP_DELL_MIC_NO_PRESENCE,

	ALC668_FIXUP_HEADSET_MODE,

	ALC662_FIXUP_BASS_CHMAP,

	ALC662_FIXUP_BASS_1A,

	ALC662_FIXUP_BASS_1A_CHMAP,

};



static const struct hda_fixup alc662_fixups[] = {
@@ -4878,6 +4927,19 @@ static const struct hda_fixup alc662_fixups[] = { 
		.chained = true,

		.chain_id = ALC662_FIXUP_ASUS_MODE4

	},

	[ALC662_FIXUP_BASS_1A] = {

		.type = HDA_FIXUP_PINS,

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

			{0x1a, 0x80106111}, /* bass speaker */

			{}

		},

	},

	[ALC662_FIXUP_BASS_1A_CHMAP] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc662_fixup_bass_chmap,

		.chained = true,

		.chain_id = ALC662_FIXUP_BASS_1A,

	},

};



static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -4890,8 +4952,10 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),

	SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0625, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0626, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),

	SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A_CHMAP),

	SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP),

	SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_CHMAP),

	SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),

sound/soc/codecs/ab8500-codec.c

+34 −32
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ struct ab8500_codec_drvdata_dbg { 


/* Private data for AB8500 device-driver */

struct ab8500_codec_drvdata {

	struct regmap *regmap;



	/* Sidetone */

	long *sid_fir_values;

	enum sid_state sid_status;
@@ -168,34 +166,48 @@ static inline const char *amic_type_str(enum amic_type type) 
 */



/* Read a register from the audio-bank of AB8500 */

static int ab8500_codec_read_reg(void *context, unsigned int reg,

				 unsigned int *value)

static unsigned int ab8500_codec_read_reg(struct snd_soc_codec *codec,

					unsigned int reg)

{

	struct device *dev = context;

	int status;

	unsigned int value = 0;



	u8 value8;

	status = abx500_get_register_interruptible(dev, AB8500_AUDIO,

	status = abx500_get_register_interruptible(codec->dev, AB8500_AUDIO,

						reg, &value8);

	*value = (unsigned int)value8;

	if (status < 0) {

		dev_err(codec->dev,

			"%s: ERROR: Register (0x%02x:0x%02x) read failed (%d).\n",

			__func__, (u8)AB8500_AUDIO, (u8)reg, status);

	} else {

		dev_dbg(codec->dev,

			"%s: Read 0x%02x from register 0x%02x:0x%02x\n",

			__func__, value8, (u8)AB8500_AUDIO, (u8)reg);

		value = (unsigned int)value8;

	}



	return status;

	return value;

}



/* Write to a register in the audio-bank of AB8500 */

static int ab8500_codec_write_reg(void *context, unsigned int reg,

				  unsigned int value)

static int ab8500_codec_write_reg(struct snd_soc_codec *codec,

				unsigned int reg, unsigned int value)

{

	struct device *dev = context;

	int status;



	return abx500_set_register_interruptible(dev, AB8500_AUDIO,

	status = abx500_set_register_interruptible(codec->dev, AB8500_AUDIO,

						reg, value);

}

	if (status < 0)

		dev_err(codec->dev,

			"%s: ERROR: Register (%02x:%02x) write failed (%d).\n",

			__func__, (u8)AB8500_AUDIO, (u8)reg, status);

	else

		dev_dbg(codec->dev,

			"%s: Wrote 0x%02x into register %02x:%02x\n",

			__func__, (u8)value, (u8)AB8500_AUDIO, (u8)reg);



static const struct regmap_config ab8500_codec_regmap = {

	.reg_read = ab8500_codec_read_reg,

	.reg_write = ab8500_codec_write_reg,

};

	return status;

}



/*

 * Controls - DAPM
@@ -2473,13 +2485,9 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) 


	dev_dbg(dev, "%s: Enter.\n", __func__);



	snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);



	/* Setup AB8500 according to board-settings */

	pdata = dev_get_platdata(dev->parent);



	codec->control_data = drvdata->regmap;



	if (np) {

		if (!pdata)

			pdata = devm_kzalloc(dev,
@@ -2557,6 +2565,9 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) 


static struct snd_soc_codec_driver ab8500_codec_driver = {

	.probe =		ab8500_codec_probe,

	.read =			ab8500_codec_read_reg,

	.write =		ab8500_codec_write_reg,

	.reg_word_size =	sizeof(u8),

	.controls =		ab8500_ctrls,

	.num_controls =		ARRAY_SIZE(ab8500_ctrls),

	.dapm_widgets =		ab8500_dapm_widgets,
@@ -2581,15 +2592,6 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev) 
	drvdata->anc_status = ANC_UNCONFIGURED;

	dev_set_drvdata(&pdev->dev, drvdata);



	drvdata->regmap = devm_regmap_init(&pdev->dev, NULL, &pdev->dev,

					   &ab8500_codec_regmap);

	if (IS_ERR(drvdata->regmap)) {

		status = PTR_ERR(drvdata->regmap);

		dev_err(&pdev->dev, "%s: Failed to allocate regmap: %d\n",

			__func__, status);

		return status;

	}



	dev_dbg(&pdev->dev, "%s: Register codec.\n", __func__);

	status = snd_soc_register_codec(&pdev->dev, &ab8500_codec_driver,

				ab8500_codec_dai,