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

Commit d630d215 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Add support for 352800 sample rate and 32 bit-width"

parents dddcda5c cfccb5b4

include/sound/pcm.h

+6 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ struct snd_pcm_ops { 
#define SNDRV_PCM_RATE_96000		(1<<10)		/* 96000Hz */

#define SNDRV_PCM_RATE_176400		(1<<11)		/* 176400Hz */

#define SNDRV_PCM_RATE_192000		(1<<12)		/* 192000Hz */

#define SNDRV_PCM_RATE_384000		(1<<13)		/* 384000Hz */

#define SNDRV_PCM_RATE_352800		(1<<13)		/* 352800Hz*/

#define SNDRV_PCM_RATE_384000		(1<<14)		/* 384000Hz */



#define SNDRV_PCM_RATE_CONTINUOUS	(1<<30)		/* continuous range */

#define SNDRV_PCM_RATE_KNOT		(1<<31)		/* supports more non-continuos rates */
@@ -149,6 +150,10 @@ struct snd_pcm_ops { 
					 SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000)

#define SNDRV_PCM_RATE_8000_192000	(SNDRV_PCM_RATE_8000_96000|SNDRV_PCM_RATE_176400|\

					 SNDRV_PCM_RATE_192000)

#define SNDRV_PCM_RATE_8000_384000	(SNDRV_PCM_RATE_8000_192000|\

					 SNDRV_PCM_RATE_352800|\

					 SNDRV_PCM_RATE_384000)



#define _SNDRV_PCM_FMTBIT(fmt)		(1ULL << (__force int)SNDRV_PCM_FORMAT_##fmt)

#define SNDRV_PCM_FMTBIT_S8		_SNDRV_PCM_FMTBIT(S8)

#define SNDRV_PCM_FMTBIT_U8		_SNDRV_PCM_FMTBIT(U8)

sound/core/pcm_native.c

+4 −4
Original line number Diff line number Diff line
@@ -1980,13 +1980,13 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params, 
	return snd_interval_refine(hw_param_interval(params, rule->var), &t);

}



#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_192000 != 1 << 12

#if SNDRV_PCM_RATE_5512 != 1 << 0 || SNDRV_PCM_RATE_384000 != 1 << 14

#error "Change this table"

#endif



static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,

				48000, 64000, 88200, 96000, 176400, 192000,

				384000 };

static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050,

		32000, 44100, 48000, 64000, 88200,

		96000, 176400, 192000, 352800, 384000 };



const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {

	.count = ARRAY_SIZE(rates),

sound/soc/msm/msm-dai-fe.c

+352 −272

File changed.

Preview size limit exceeded, changes collapsed.