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

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

Pull sound fixes from Takashi Iwai:
 "Most of changes are fairly small and driver-specific.

  A remaining regression fix for USB-audio sync pipe check, a fix for
  HD-audio power-up sequence, fixes for ASoC pxa-ssp compile issues, and
  bunch of ASoC codec and trivial fix patches."

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: 6fire: use NULL instead of 0 for pointer assignment
  ALSA: hda - Handle open while transitioning to D3.
  ALSA: snd-usb: make snd_usb_substream_capture_trigger static
  ALSA: snd-usb: fix sync pipe check
  ASoC: tegra+wm8903: turn of mic detect when card is removed
  ASoC: wm8996: Mark the CODEC as cache only when powering off on boot
  ASoC: wm8996: Move reset before the initial regulator disable
  ASoC: wm8996: Remove spurious regulator_bulk_free()
  ASoC: wm8904: Fix cache only management
  ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion
  ASoC: fix pxa-ssp compiling issue under mach-mmp
  ARM: MMP: add pxa910-ssp into ssp_id_table
parents 2fe8ac60 0b1d8e09

arch/arm/plat-pxa/ssp.c

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ static const struct platform_device_id ssp_id_table[] = { 
	{ "pxa25x-nssp",	PXA25x_NSSP },

	{ "pxa27x-ssp",		PXA27x_SSP },

	{ "pxa168-ssp",		PXA168_SSP },

	{ "pxa910-ssp",		PXA910_SSP },

	{ },

};

include/linux/pxa2xx_ssp.h

+2 −0
Original line number Diff line number Diff line
@@ -160,7 +160,9 @@ enum pxa_ssp_type { 
	PXA25x_SSP,  /* pxa 210, 250, 255, 26x */

	PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */

	PXA27x_SSP,

	PXA3xx_SSP,

	PXA168_SSP,

	PXA910_SSP,

	CE4100_SSP,

};

include/linux/spi/pxa2xx_spi.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct pxa2xx_spi_chip { 
	void (*cs_control)(u32 command);

};



#ifdef CONFIG_ARCH_PXA

#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)



#include <linux/clk.h>

#include <mach/dma.h>

sound/pci/hda/hda_codec.c

+37 −9
Original line number Diff line number Diff line
@@ -4393,20 +4393,19 @@ void snd_hda_update_power_acct(struct hda_codec *codec) 
	codec->power_jiffies += delta;

}



/**

 * snd_hda_power_up - Power-up the codec

 * @codec: HD-audio codec

 *

 * Increment the power-up counter and power up the hardware really when

 * not turned on yet.

 */

void snd_hda_power_up(struct hda_codec *codec)

/* Transition to powered up, if wait_power_down then wait for a pending

 * transition to D3 to complete. A pending D3 transition is indicated

 * with power_transition == -1. */

static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)

{

	struct hda_bus *bus = codec->bus;



	spin_lock(&codec->power_lock);

	codec->power_count++;

	if (codec->power_on || codec->power_transition > 0) {

	/* Return if power_on or transitioning to power_on, unless currently

	 * powering down. */

	if ((codec->power_on || codec->power_transition > 0) &&

	    !(wait_power_down && codec->power_transition < 0)) {

		spin_unlock(&codec->power_lock);

		return;

	}
@@ -4430,8 +4429,37 @@ void snd_hda_power_up(struct hda_codec *codec) 
	codec->power_transition = 0;

	spin_unlock(&codec->power_lock);

}



/**

 * snd_hda_power_up - Power-up the codec

 * @codec: HD-audio codec

 *

 * Increment the power-up counter and power up the hardware really when

 * not turned on yet.

 */

void snd_hda_power_up(struct hda_codec *codec)

{

	__snd_hda_power_up(codec, false);

}

EXPORT_SYMBOL_HDA(snd_hda_power_up);



/**

 * snd_hda_power_up_d3wait - Power-up the codec after waiting for any pending

 *   D3 transition to complete.  This differs from snd_hda_power_up() when

 *   power_transition == -1.  snd_hda_power_up sees this case as a nop,

 *   snd_hda_power_up_d3wait waits for the D3 transition to complete then powers

 *   back up.

 * @codec: HD-audio codec

 *

 * Cancel any power down operation hapenning on the work queue, then power up.

 */

void snd_hda_power_up_d3wait(struct hda_codec *codec)

{

	/* This will cancel and wait for pending power_work to complete. */

	__snd_hda_power_up(codec, true);

}

EXPORT_SYMBOL_HDA(snd_hda_power_up_d3wait);



#define power_save(codec)	\

	((codec)->bus->power_save ? *(codec)->bus->power_save : 0)

sound/pci/hda/hda_codec.h

+2 −0
Original line number Diff line number Diff line
@@ -1056,10 +1056,12 @@ const char *snd_hda_get_jack_location(u32 cfg); 
 */

#ifdef CONFIG_SND_HDA_POWER_SAVE

void snd_hda_power_up(struct hda_codec *codec);

void snd_hda_power_up_d3wait(struct hda_codec *codec);

void snd_hda_power_down(struct hda_codec *codec);

void snd_hda_update_power_acct(struct hda_codec *codec);

#else

static inline void snd_hda_power_up(struct hda_codec *codec) {}

static inline void snd_hda_power_up_d3wait(struct hda_codec *codec) {}

static inline void snd_hda_power_down(struct hda_codec *codec) {}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE