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

Commit 8f074a55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Just a handful of regression and small fixes in ASoC, HD-audio and
  USB-audio drivers.

   - Sigmetal HD-audio codec regression fixes
   - A copule of XRUN indication fixes for usb-audio devices
   - ASoC: ep93xx build fix, sgtl5000 fix for probe order changes,
     max98088 register access fix, etc"

* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hiface: return correct XRUN indication
  ASoC: tegra: correct playback_dma_data setup
  ASoC: core: double free in snd_soc_add_platform()
  ALSA: usb-audio: 6fire: return correct XRUN indication
  ASoC: ep93xx: fix build of ep93xx-ac97.c
  ALSA: hda - Remove NO_PRESENCE bit override for Dell 1420n Laptop
  ALSA: hda - Fix EAPD GPIO control for Sigmatel codecs
  ASoC: atmel-ssc: remove clk_disable_unprepare call from critical section
  ASoC: sgtl5000: defer the probe if clock is not found
  ASoC: max98088 - fix element type of the register cache.
parents 6c4155a9 43cbd286

drivers/misc/atmel-ssc.c

+8 −3
Original line number Diff line number Diff line
@@ -66,14 +66,19 @@ EXPORT_SYMBOL(ssc_request); 


void ssc_free(struct ssc_device *ssc)

{

	bool disable_clk = true;



	spin_lock(&user_lock);

	if (ssc->user) {

	if (ssc->user)

		ssc->user--;

		clk_disable_unprepare(ssc->clk);

	} else {

	else {

		disable_clk = false;

		dev_dbg(&ssc->pdev->dev, "device already free\n");

	}

	spin_unlock(&user_lock);



	if (disable_clk)

		clk_disable_unprepare(ssc->clk);

}

EXPORT_SYMBOL(ssc_free);

sound/pci/hda/patch_sigmatel.c

+7 −6
Original line number Diff line number Diff line
@@ -417,11 +417,13 @@ static void stac_update_outputs(struct hda_codec *codec) 
			val &= ~spec->eapd_mask;

		else

			val |= spec->eapd_mask;

		if (spec->gpio_data != val)

		if (spec->gpio_data != val) {

			spec->gpio_data = val;

			stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir,

				      val);

		}

	}

}



static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,

				  bool enable, bool do_write)
@@ -3231,7 +3233,7 @@ static const struct hda_fixup stac927x_fixups[] = { 
			/* configure the analog microphone on some laptops */

			{ 0x0c, 0x90a79130 },

			/* correct the front output jack as a hp out */

			{ 0x0f, 0x0227011f },

			{ 0x0f, 0x0221101f },

			/* correct the front input jack as a mic */

			{ 0x0e, 0x02a79130 },

			{}
@@ -3612,20 +3614,18 @@ static int stac_parse_auto_config(struct hda_codec *codec) 
static int stac_init(struct hda_codec *codec)

{

	struct sigmatel_spec *spec = codec->spec;

	unsigned int gpio;

	int i;



	/* override some hints */

	stac_store_hints(codec);



	/* set up GPIO */

	gpio = spec->gpio_data;

	/* turn on EAPD statically when spec->eapd_switch isn't set.

	 * otherwise, unsol event will turn it on/off dynamically

	 */

	if (!spec->eapd_switch)

		gpio |= spec->eapd_mask;

	stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, gpio);

		spec->gpio_data |= spec->eapd_mask;

	stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, spec->gpio_data);



	snd_hda_gen_init(codec);
@@ -3915,6 +3915,7 @@ static void stac_setup_gpio(struct hda_codec *codec) 
{

	struct sigmatel_spec *spec = codec->spec;



	spec->gpio_mask |= spec->eapd_mask;

	if (spec->gpio_led) {

		if (!spec->vref_mute_led_nid) {

			spec->gpio_mask |= spec->gpio_led;

sound/soc/cirrus/ep93xx-ac97.c

+2 −2
Original line number Diff line number Diff line
@@ -102,13 +102,13 @@ static struct ep93xx_ac97_info *ep93xx_ac97_info; 


static struct ep93xx_dma_data ep93xx_ac97_pcm_out = {

	.name		= "ac97-pcm-out",

	.dma_port	= EP93XX_DMA_AAC1,

	.port		= EP93XX_DMA_AAC1,

	.direction	= DMA_MEM_TO_DEV,

};



static struct ep93xx_dma_data ep93xx_ac97_pcm_in = {

	.name		= "ac97-pcm-in",

	.dma_port	= EP93XX_DMA_AAC1,

	.port		= EP93XX_DMA_AAC1,

	.direction	= DMA_DEV_TO_MEM,

};

sound/soc/codecs/max98088.c

+1 −1
Original line number Diff line number Diff line
@@ -1612,7 +1612,7 @@ static int max98088_dai2_digital_mute(struct snd_soc_dai *codec_dai, int mute) 


static void max98088_sync_cache(struct snd_soc_codec *codec)

{

       u16 *reg_cache = codec->reg_cache;

       u8 *reg_cache = codec->reg_cache;

       int i;



       if (!codec->cache_sync)

sound/soc/codecs/sgtl5000.c

+3 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,9 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, 
	if (IS_ERR(sgtl5000->mclk)) {

		ret = PTR_ERR(sgtl5000->mclk);

		dev_err(&client->dev, "Failed to get mclock: %d\n", ret);

		/* Defer the probe to see if the clk will be provided later */

		if (ret == -ENOENT)

			return -EPROBE_DEFER;

		return ret;

	}