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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (22 commits)
  ALSA: hda - Cirrus Logic CS421x support
  ALSA: Make pcm.h self-contained
  ALSA: hda - Allow codec-specific set_power_state ops
  ALSA: hda - Add post_suspend patch ops
  ALSA: hda - Make CONFIG_SND_HDA_POWER_SAVE depending on CONFIG_PM
  ALSA: hda - Make sure mute led reflects master mute state
  ALSA: hda - Fix invalid mute led state on resume of IDT codecs
  ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver"
  ALSA: hda - Add support of the 4 internal speakers on certain HP laptops
  ALSA: Make snd_pcm_debug_name usable outside pcm_lib
  ALSA: hda - Fix DAC filling for multi-connection pins in Realtek parser
  ASoC: dapm - Add methods to retrieve snd_card and soc_card from dapm context.
  ASoC: SAMSUNG: Add I2S0 internal dma driver
  ASoC: SAMSUNG: Modify I2S driver to support idma
  ASoC: davinci: add missing break statement
  ASoC: davinci: fix codec start and stop functions
  ASoC: dapm - add DAPM macro for external enum widgets
  ASoC: Acknowledge WM8962 interrupts before acting on them
  ASoC: sgtl5000: guide user when regulator support is needed
  ASoC: sgtl5000: refactor registering internal ldo
  ...
parents 70a3eff5 636f7858

include/sound/pcm.h

+24 −11
Original line number Diff line number Diff line
@@ -507,6 +507,18 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream); 
void snd_pcm_vma_notify_data(void *client, void *data);

int snd_pcm_mmap_data(struct snd_pcm_substream *substream, struct file *file, struct vm_area_struct *area);





#ifdef CONFIG_SND_DEBUG

void snd_pcm_debug_name(struct snd_pcm_substream *substream,

			   char *name, size_t len);

#else

static inline void

snd_pcm_debug_name(struct snd_pcm_substream *substream, char *buf, size_t size)

{

	*buf = 0;

}

#endif



/*

 *  PCM library

 */
@@ -749,17 +761,18 @@ static inline const struct snd_interval *hw_param_interval_c(const struct snd_pc 
	return &params->intervals[var - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL];

}



#define params_access(p) ((__force snd_pcm_access_t)snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_ACCESS)))

#define params_format(p) ((__force snd_pcm_format_t)snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_FORMAT)))

#define params_subformat(p) snd_mask_min(hw_param_mask((p), SNDRV_PCM_HW_PARAM_SUBFORMAT))

#define params_channels(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_CHANNELS)->min

#define params_rate(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_RATE)->min

#define params_period_size(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->min

#define params_period_bytes(p) ((params_period_size(p)*snd_pcm_format_physical_width(params_format(p))*params_channels(p))/8)

#define params_periods(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_PERIODS)->min

#define params_buffer_size(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_SIZE)->min

#define params_buffer_bytes(p) hw_param_interval((p), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min



#define params_channels(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_CHANNELS)->min)

#define params_rate(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_RATE)->min)

#define params_period_size(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_PERIOD_SIZE)->min)

#define params_periods(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_PERIODS)->min)

#define params_buffer_size(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_BUFFER_SIZE)->min)

#define params_buffer_bytes(p) \

	(hw_param_interval_c((p), SNDRV_PCM_HW_PARAM_BUFFER_BYTES)->min)



int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v);

void snd_interval_mul(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c);

include/sound/pcm_params.h

+15 −1
Original line number Diff line number Diff line
@@ -337,5 +337,19 @@ static inline unsigned int sub(unsigned int a, unsigned int b) 
	return 0;

}



#endif /* __SOUND_PCM_PARAMS_H */

#define params_access(p) ((__force snd_pcm_access_t)\

		snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_ACCESS)))

#define params_format(p) ((__force snd_pcm_format_t)\

		snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_FORMAT)))

#define params_subformat(p) \

	snd_mask_min(hw_param_mask_c((p), SNDRV_PCM_HW_PARAM_SUBFORMAT))



static inline unsigned int

params_period_bytes(const struct snd_pcm_hw_params *p)

{

	return (params_period_size(p) *

		snd_pcm_format_physical_width(params_format(p)) *

		params_channels(p)) / 8;

}



#endif /* __SOUND_PCM_PARAMS_H */

include/sound/soc-dapm.h

+6 −0
Original line number Diff line number Diff line
@@ -266,6 +266,12 @@ 
	.get = snd_soc_dapm_get_enum_virt, \

	.put = snd_soc_dapm_put_enum_virt, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_enum_double, \

	.get = xget, \

	.put = xput, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_enum_double, \

sound/core/pcm_lib.c

+8 −5
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram 
	}

}



static void pcm_debug_name(struct snd_pcm_substream *substream,

#ifdef CONFIG_SND_DEBUG

void snd_pcm_debug_name(struct snd_pcm_substream *substream,

			   char *name, size_t len)

{

	snprintf(name, len, "pcmC%dD%d%c:%d",
@@ -137,6 +138,8 @@ static void pcm_debug_name(struct snd_pcm_substream *substream, 
		 substream->stream ? 'c' : 'p',

		 substream->number);

}

EXPORT_SYMBOL(snd_pcm_debug_name);

#endif



#define XRUN_DEBUG_BASIC	(1<<0)

#define XRUN_DEBUG_STACK	(1<<1)	/* dump also stack */
@@ -168,7 +171,7 @@ static void xrun(struct snd_pcm_substream *substream) 
	snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

	if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {

		char name[16];

		pcm_debug_name(substream, name, sizeof(name));

		snd_pcm_debug_name(substream, name, sizeof(name));

		snd_printd(KERN_DEBUG "XRUN: %s\n", name);

		dump_stack_on_xrun(substream);

	}
@@ -243,7 +246,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream) 
		return;

	if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) && log->hit)

		return;

	pcm_debug_name(substream, name, sizeof(name));

	snd_pcm_debug_name(substream, name, sizeof(name));

	for (cnt = 0, idx = log->idx; cnt < XRUN_LOG_CNT; cnt++) {

		entry = &log->entries[idx];

		if (entry->period_size == 0)
@@ -319,7 +322,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	if (pos >= runtime->buffer_size) {

		if (printk_ratelimit()) {

			char name[16];

			pcm_debug_name(substream, name, sizeof(name));

			snd_pcm_debug_name(substream, name, sizeof(name));

			xrun_log_show(substream);

			snd_printd(KERN_ERR  "BUG: %s, pos = %ld, "

				   "buffer size = %ld, period size = %ld\n",
@@ -364,7 +367,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	if (xrun_debug(substream, in_interrupt ?

			XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {

		char name[16];

		pcm_debug_name(substream, name, sizeof(name));

		snd_pcm_debug_name(substream, name, sizeof(name));

		snd_printd("%s_update: %s: pos=%u/%u/%u, "

			   "hwptr=%ld/%ld/%ld/%ld\n",

			   in_interrupt ? "period" : "hwptr",

sound/pci/asihpi/asihpi.c

+0 −21
Original line number Diff line number Diff line
@@ -41,31 +41,10 @@ 
#include <sound/tlv.h>

#include <sound/hwdep.h>





MODULE_LICENSE("GPL");

MODULE_AUTHOR("AudioScience inc. <support@audioscience.com>");

MODULE_DESCRIPTION("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx");



#if defined CONFIG_SND_DEBUG

/* copied from pcm_lib.c, hope later patch will make that version public

and this copy can be removed */

static inline void

snd_pcm_debug_name(struct snd_pcm_substream *substream, char *buf, size_t size)

{

	snprintf(buf, size, "pcmC%dD%d%c:%d",

		 substream->pcm->card->number,

		 substream->pcm->device,

		 substream->stream ? 'c' : 'p',

		 substream->number);

}

#else

static inline void

snd_pcm_debug_name(struct snd_pcm_substream *substream, char *buf, size_t size)

{

	*buf = 0;

}

#endif



#if defined CONFIG_SND_DEBUG_VERBOSE

/**

 * snd_printddd - very verbose debug printk

CRA Git | Maintained and supported by SUSTech CRA and CCSE