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

Commit 2f43a23a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai

parents 7cfa7b54 55dcdb50

include/sound/pcm.h

+2 −0
Original line number Diff line number Diff line
@@ -900,6 +900,8 @@ extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates; 
int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);

unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);

unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit);

unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,

					 unsigned int rates_b);



static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream,

					      struct snd_dma_buffer *bufp)

include/sound/soc.h

+4 −0
Original line number Diff line number Diff line
@@ -895,6 +895,10 @@ struct snd_soc_dai_link { 
	/* This DAI link can route to other DAI links at runtime (Frontend)*/

	unsigned int dynamic:1;



	/* DPCM capture and Playback support */

	unsigned int dpcm_capture:1;

	unsigned int dpcm_playback:1;



	/* pmdown_time is ignored at stop */

	unsigned int ignore_pmdown_time:1;

sound/core/pcm_misc.c

+39 −0
Original line number Diff line number Diff line
@@ -514,3 +514,42 @@ unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit) 
	return 0;

}

EXPORT_SYMBOL(snd_pcm_rate_bit_to_rate);



static unsigned int snd_pcm_rate_mask_sanitize(unsigned int rates)

{

	if (rates & SNDRV_PCM_RATE_CONTINUOUS)

		return SNDRV_PCM_RATE_CONTINUOUS;

	else if (rates & SNDRV_PCM_RATE_KNOT)

		return SNDRV_PCM_RATE_KNOT;

	return rates;

}



/**

 * snd_pcm_rate_mask_intersect - computes the intersection between two rate masks

 * @rates_a: The first rate mask

 * @rates_b: The second rate mask

 *

 * This function computes the rates that are supported by both rate masks passed

 * to the function. It will take care of the special handling of

 * SNDRV_PCM_RATE_CONTINUOUS and SNDRV_PCM_RATE_KNOT.

 *

 * Return: A rate mask containing the rates that are supported by both rates_a

 * and rates_b.

 */

unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,

	unsigned int rates_b)

{

	rates_a = snd_pcm_rate_mask_sanitize(rates_a);

	rates_b = snd_pcm_rate_mask_sanitize(rates_b);



	if (rates_a & SNDRV_PCM_RATE_CONTINUOUS)

		return rates_b;

	else if (rates_b & SNDRV_PCM_RATE_CONTINUOUS)

		return rates_a;

	else if (rates_a & SNDRV_PCM_RATE_KNOT)

		return rates_b;

	else if (rates_b & SNDRV_PCM_RATE_KNOT)

		return rates_a;

	return rates_a & rates_b;

}

EXPORT_SYMBOL_GPL(snd_pcm_rate_mask_intersect);

sound/soc/fsl/fsl_ssi.c

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ static inline void write_ssi_mask(u32 __iomem *addr, u32 clear, u32 set) 
 * ALSA that we support all rates and let the codec driver decide what rates

 * are really supported.

 */

#define FSLSSI_I2S_RATES (SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_192000 | \

			  SNDRV_PCM_RATE_CONTINUOUS)

#define FSLSSI_I2S_RATES SNDRV_PCM_RATE_CONTINUOUS



/**

 * FSLSSI_I2S_FORMATS: audio formats supported by the SSI

sound/soc/fsl/mpc5200_psc_i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
 * ALSA that we support all rates and let the codec driver decide what rates

 * are really supported.

 */

#define PSC_I2S_RATES (SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_192000 | \

			SNDRV_PCM_RATE_CONTINUOUS)

#define PSC_I2S_RATES SNDRV_PCM_RATE_CONTINUOUS



/**

 * PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode