[alsa-devel] [PATCH 0/2] ASoC: pcm512x: Fixups for the Clock master modes series
From: Peter Rosin peda@axentia.se
These fixups can either be squashed in with 5/7 from the Clock master mode series, or they can be added on top of the current topic/pcm512x. Sorry for the trouble.
I can squash them, and resend the Clock master modes series if that helps. Let me know how you'd like it.
Cheers, Peter
Peter Rosin (2): ASoC: pcm512x: Fixup warning splat ASoC: pcm512x: Use the correct range constraints for S24_LE
sound/soc/codecs/pcm512x.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-)
From: Peter Rosin peda@axentia.se
Reported-by: kbuild test robot fengguang.wu@intel.com Signed-off-by: Peter Rosin peda@axentia.se --- sound/soc/codecs/pcm512x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 51b279e3f465..067d11743c31 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -1266,7 +1266,6 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) { struct pcm512x_priv *pcm512x; int i, ret; - u32 val;
pcm512x = devm_kzalloc(dev, sizeof(struct pcm512x_priv), GFP_KERNEL); if (!pcm512x) @@ -1347,6 +1346,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) #ifdef CONFIG_OF if (dev->of_node) { const struct device_node *np = dev->of_node; + u32 val;
if (of_property_read_u32(np, "pll-in", &val) >= 0) { if (val > 6) {
From: Peter Rosin peda@axentia.se
This was overlooked in the late change to remove the I2S padding bits from S24_LE mode. The patch also limits S32_LE mode to 384kHz, the maximum according to the datasheets.
Signed-off-by: Peter Rosin peda@axentia.se --- sound/soc/codecs/pcm512x.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 067d11743c31..884784fb1566 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -356,36 +356,37 @@ static const struct snd_pcm_hw_constraint_list constraints_slave = { .list = pcm512x_dai_rates, };
-static const struct snd_interval pcm512x_dai_ranges_64bpf[] = { - { - .min = 8000, - .max = 195312, - }, { - .min = 250000, - .max = 390625, - }, -}; - -static struct snd_pcm_hw_constraint_ranges constraints_64bpf = { - .count = ARRAY_SIZE(pcm512x_dai_ranges_64bpf), - .ranges = pcm512x_dai_ranges_64bpf, -}; - static int pcm512x_hw_rule_rate(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule *rule) { - struct snd_pcm_hw_constraint_ranges *r = rule->private; + struct snd_interval ranges[2]; int frame_size;
frame_size = snd_soc_params_to_frame_size(params); if (frame_size < 0) return frame_size;
- if (frame_size != 64) + switch (frame_size) { + case 32: + /* No hole when the frame size is 32. */ return 0; + case 48: + case 64: + /* There is only one hole in the range of supported + * rates, but it moves with the frame size. + */ + memset(ranges, 0, sizeof(ranges)); + ranges[0].min = 8000; + ranges[0].max = 25000000 / frame_size / 2; + ranges[1].min = DIV_ROUND_UP(16000000, frame_size); + ranges[1].max = 384000; + break; + default: + return -EINVAL; + }
return snd_interval_ranges(hw_param_interval(params, rule->var), - r->count, r->ranges, r->mask); + ARRAY_SIZE(ranges), ranges, 0); }
static int pcm512x_dai_startup_master(struct snd_pcm_substream *substream, @@ -407,7 +408,7 @@ static int pcm512x_dai_startup_master(struct snd_pcm_substream *substream, return snd_pcm_hw_rule_add(substream->runtime, 0, SNDRV_PCM_HW_PARAM_RATE, pcm512x_hw_rule_rate, - (void *)&constraints_64bpf, + NULL, SNDRV_PCM_HW_PARAM_FRAME_BITS, SNDRV_PCM_HW_PARAM_CHANNELS, -1);
On Thu, Jan 29, 2015 at 12:21:54PM +0100, Peter Rosin wrote:
From: Peter Rosin peda@axentia.se
These fixups can either be squashed in with 5/7 from the Clock master mode series, or they can be added on top of the current topic/pcm512x. Sorry for the trouble.
applied, thanks.
participants (2)
-
Mark Brown -
Peter Rosin