Commit d81221ff authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Add support for SNDRV_PCM_RATE_KNOT 



The Arizona CODECs support several rates that do not have simple defines
in ALSA. This patch adds support for SNDRV_PCM_RATE_KNOT so that users
can open stream at these rates. As part of this we should always set
constraints in arizona_startup, currently we only set the constraints if
we already have a clock to limit rates to that family of sample rates.
This patch updates this to set a constraint of all rates supported by
the chip if we do not already know which family of rates to limit to.
Finally we also reduce the list of rates supported in the constraints to
only include those that are supported on current parts.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3a9686c4

sound/soc/codecs/arizona.c

+16 −46
Original line number Diff line number Diff line
@@ -1398,29 +1398,6 @@ static const int arizona_48k_bclk_rates[] = { 
	24576000,

};



static const unsigned int arizona_48k_rates[] = {

	12000,

	24000,

	48000,

	96000,

	192000,

	384000,

	768000,

	4000,

	8000,

	16000,

	32000,

	64000,

	128000,

	256000,

	512000,

};



static const struct snd_pcm_hw_constraint_list arizona_48k_constraint = {

	.count	= ARRAY_SIZE(arizona_48k_rates),

	.list	= arizona_48k_rates,

};



static const int arizona_44k1_bclk_rates[] = {

	-1,

	44100,
@@ -1443,22 +1420,7 @@ static const int arizona_44k1_bclk_rates[] = { 
	22579200,

};



static const unsigned int arizona_44k1_rates[] = {

	11025,

	22050,

	44100,

	88200,

	176400,

	352800,

	705600,

};



static const struct snd_pcm_hw_constraint_list arizona_44k1_constraint = {

	.count	= ARRAY_SIZE(arizona_44k1_rates),

	.list	= arizona_44k1_rates,

};



static int arizona_sr_vals[] = {

static const unsigned int arizona_sr_vals[] = {

	0,

	12000,

	24000,
@@ -1485,13 +1447,21 @@ static int arizona_sr_vals[] = { 
	512000,

};



#define ARIZONA_48K_RATE_MASK	0x0F003E

#define ARIZONA_44K1_RATE_MASK	0x003E00

#define ARIZONA_RATE_MASK	(ARIZONA_48K_RATE_MASK | ARIZONA_44K1_RATE_MASK)



static const struct snd_pcm_hw_constraint_list arizona_constraint = {

	.count	= ARRAY_SIZE(arizona_sr_vals),

	.list	= arizona_sr_vals,

};



static int arizona_startup(struct snd_pcm_substream *substream,

			   struct snd_soc_dai *dai)

{

	struct snd_soc_codec *codec = dai->codec;

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona_dai_priv *dai_priv = &priv->dai[dai->id - 1];

	const struct snd_pcm_hw_constraint_list *constraint;

	unsigned int base_rate;



	if (!substream->runtime)
@@ -1509,16 +1479,15 @@ static int arizona_startup(struct snd_pcm_substream *substream, 
	}



	if (base_rate == 0)

		return 0;



	if (base_rate % 8000)

		constraint = &arizona_44k1_constraint;

		dai_priv->constraint.mask = ARIZONA_RATE_MASK;

	else if (base_rate % 8000)

		dai_priv->constraint.mask = ARIZONA_44K1_RATE_MASK;

	else

		constraint = &arizona_48k_constraint;

		dai_priv->constraint.mask = ARIZONA_48K_RATE_MASK;



	return snd_pcm_hw_constraint_list(substream->runtime, 0,

					  SNDRV_PCM_HW_PARAM_RATE,

					  constraint);

					  &dai_priv->constraint);

}



static void arizona_wm5102_set_dac_comp(struct snd_soc_codec *codec,
@@ -1911,6 +1880,7 @@ int arizona_init_dai(struct arizona_priv *priv, int id) 
	struct arizona_dai_priv *dai_priv = &priv->dai[id];



	dai_priv->clk = ARIZONA_CLK_SYSCLK;

	dai_priv->constraint = arizona_constraint;



	return 0;

}

sound/soc/codecs/arizona.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ struct wm_adsp; 


struct arizona_dai_priv {

	int clk;



	struct snd_pcm_hw_constraint_list constraint;

};



struct arizona_priv {

sound/soc/codecs/cs47l24.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static int cs47l24_set_fll(struct snd_soc_codec *codec, int fll_id, int source, 
	}

}



#define CS47L24_RATES SNDRV_PCM_RATE_8000_192000

#define CS47L24_RATES SNDRV_PCM_RATE_KNOT



#define CS47L24_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

			 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)

sound/soc/codecs/wm5102.c

+1 −1
Original line number Diff line number Diff line
@@ -1738,7 +1738,7 @@ static int wm5102_set_fll(struct snd_soc_codec *codec, int fll_id, int source, 
	}

}



#define WM5102_RATES SNDRV_PCM_RATE_8000_192000

#define WM5102_RATES SNDRV_PCM_RATE_KNOT



#define WM5102_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

			SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)

sound/soc/codecs/wm5110.c

+1 −1
Original line number Diff line number Diff line
@@ -2024,7 +2024,7 @@ static int wm5110_set_fll(struct snd_soc_codec *codec, int fll_id, int source, 
	}

}



#define WM5110_RATES SNDRV_PCM_RATE_8000_192000

#define WM5110_RATES SNDRV_PCM_RATE_KNOT



#define WM5110_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

			SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE