* [PATCH 2/5] ASoC: ad193x: Use params_width() rather than memory format
2014-01-08 18:51 [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format Mark Brown
@ 2014-01-08 18:51 ` Mark Brown
2014-01-08 18:51 ` [PATCH 3/5] ASoC: adau1373: " Mark Brown
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2014-01-08 18:51 UTC (permalink / raw)
To: Lars-Peter Clausen, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/ad193x.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c
index 12c27eb363dd..5a42dca535b7 100644
--- a/sound/soc/codecs/ad193x.c
+++ b/sound/soc/codecs/ad193x.c
@@ -249,15 +249,15 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream,
struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);
/* bit size */
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
word_len = 3;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
word_len = 1;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 24:
+ case 32:
word_len = 0;
break;
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] ASoC: adau1373: Use params_width() rather than memory format
2014-01-08 18:51 [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format Mark Brown
2014-01-08 18:51 ` [PATCH 2/5] ASoC: ad193x: Use params_width() rather than " Mark Brown
@ 2014-01-08 18:51 ` Mark Brown
2014-01-08 18:51 ` [PATCH 4/5] ASoC: adau1701: " Mark Brown
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2014-01-08 18:51 UTC (permalink / raw)
To: Lars-Peter Clausen, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/adau1373.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 59654b1e7f3f..eb836ed5271f 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -1078,17 +1078,17 @@ static int adau1373_hw_params(struct snd_pcm_substream *substream,
ADAU1373_BCLKDIV_SR_MASK | ADAU1373_BCLKDIV_BCLK_MASK,
(div << 2) | ADAU1373_BCLKDIV_64);
- switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
ctrl = ADAU1373_DAI_WLEN_16;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
ctrl = ADAU1373_DAI_WLEN_20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
ctrl = ADAU1373_DAI_WLEN_24;
break;
- case SNDRV_PCM_FORMAT_S32_LE:
+ case 32:
ctrl = ADAU1373_DAI_WLEN_32;
break;
default:
--
1.8.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] ASoC: adau1701: Use params_width() rather than memory format
2014-01-08 18:51 [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format Mark Brown
2014-01-08 18:51 ` [PATCH 2/5] ASoC: ad193x: Use params_width() rather than " Mark Brown
2014-01-08 18:51 ` [PATCH 3/5] ASoC: adau1373: " Mark Brown
@ 2014-01-08 18:51 ` Mark Brown
2014-01-08 18:51 ` [PATCH 5/5] ASoC: adav80x: " Mark Brown
2014-01-09 10:27 ` [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit " Lars-Peter Clausen
4 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2014-01-08 18:51 UTC (permalink / raw)
To: Lars-Peter Clausen, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/adau1701.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index ebff1128be59..52e3d83e26e6 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -299,20 +299,20 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv)
}
static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,
- snd_pcm_format_t format)
+ struct snd_pcm_hw_params *params)
{
struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
unsigned int mask = ADAU1701_SEROCTL_WORD_LEN_MASK;
unsigned int val;
- switch (format) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
val = ADAU1701_SEROCTL_WORD_LEN_16;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
val = ADAU1701_SEROCTL_WORD_LEN_20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
val = ADAU1701_SEROCTL_WORD_LEN_24;
break;
default:
@@ -320,14 +320,14 @@ static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,
}
if (adau1701->dai_fmt == SND_SOC_DAIFMT_RIGHT_J) {
- switch (format) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
val |= ADAU1701_SEROCTL_MSB_DEALY16;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
val |= ADAU1701_SEROCTL_MSB_DEALY12;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
val |= ADAU1701_SEROCTL_MSB_DEALY8;
break;
}
@@ -340,7 +340,7 @@ static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,
}
static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec,
- snd_pcm_format_t format)
+ struct snd_pcm_hw_params *params)
{
struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
unsigned int val;
@@ -348,14 +348,14 @@ static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec,
if (adau1701->dai_fmt != SND_SOC_DAIFMT_RIGHT_J)
return 0;
- switch (format) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
val = ADAU1701_SERICTL_RIGHTJ_16;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
val = ADAU1701_SERICTL_RIGHTJ_20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
val = ADAU1701_SERICTL_RIGHTJ_24;
break;
default:
@@ -374,7 +374,6 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_codec *codec = dai->codec;
struct adau1701 *adau1701 = snd_soc_codec_get_drvdata(codec);
unsigned int clkdiv = adau1701->sysclk / params_rate(params);
- snd_pcm_format_t format;
unsigned int val;
int ret;
@@ -406,11 +405,10 @@ static int adau1701_hw_params(struct snd_pcm_substream *substream,
regmap_update_bits(adau1701->regmap, ADAU1701_DSPCTRL,
ADAU1701_DSPCTRL_SR_MASK, val);
- format = params_format(params);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
- return adau1701_set_playback_pcm_format(codec, format);
+ return adau1701_set_playback_pcm_format(codec, params);
else
- return adau1701_set_capture_pcm_format(codec, format);
+ return adau1701_set_capture_pcm_format(codec, params);
}
static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai,
--
1.8.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] ASoC: adav80x: Use params_width() rather than memory format
2014-01-08 18:51 [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format Mark Brown
` (2 preceding siblings ...)
2014-01-08 18:51 ` [PATCH 4/5] ASoC: adau1701: " Mark Brown
@ 2014-01-08 18:51 ` Mark Brown
2014-01-09 10:27 ` [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit " Lars-Peter Clausen
4 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2014-01-08 18:51 UTC (permalink / raw)
To: Lars-Peter Clausen, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/adav80x.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index f7bf45552749..f78b27a7c461 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -453,22 +453,22 @@ static int adav80x_set_dac_clock(struct snd_soc_codec *codec,
}
static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec,
- struct snd_soc_dai *dai, snd_pcm_format_t format)
+ struct snd_soc_dai *dai, struct snd_pcm_hw_params *params)
{
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
unsigned int val;
- switch (format) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
val = ADAV80X_CAPTURE_WORD_LEN16;
break;
- case SNDRV_PCM_FORMAT_S18_3LE:
+ case 18:
val = ADAV80X_CAPTRUE_WORD_LEN18;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
val = ADAV80X_CAPTURE_WORD_LEN20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
val = ADAV80X_CAPTURE_WORD_LEN24;
break;
default:
@@ -482,7 +482,7 @@ static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec,
}
static int adav80x_set_playback_pcm_format(struct snd_soc_codec *codec,
- struct snd_soc_dai *dai, snd_pcm_format_t format)
+ struct snd_soc_dai *dai, struct snd_pcm_hw_params *params)
{
struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
unsigned int val;
@@ -490,17 +490,17 @@ static int adav80x_set_playback_pcm_format(struct snd_soc_codec *codec,
if (adav80x->dai_fmt[dai->id] != SND_SOC_DAIFMT_RIGHT_J)
return 0;
- switch (format) {
- case SNDRV_PCM_FORMAT_S16_LE:
+ switch (params_width(params)) {
+ case 16:
val = ADAV80X_PLAYBACK_MODE_RIGHT_J_16;
break;
- case SNDRV_PCM_FORMAT_S18_3LE:
+ case 18:
val = ADAV80X_PLAYBACK_MODE_RIGHT_J_18;
break;
- case SNDRV_PCM_FORMAT_S20_3LE:
+ case 20:
val = ADAV80X_PLAYBACK_MODE_RIGHT_J_20;
break;
- case SNDRV_PCM_FORMAT_S24_LE:
+ case 24:
val = ADAV80X_PLAYBACK_MODE_RIGHT_J_24;
break;
default:
@@ -524,12 +524,10 @@ static int adav80x_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- adav80x_set_playback_pcm_format(codec, dai,
- params_format(params));
+ adav80x_set_playback_pcm_format(codec, dai, params);
adav80x_set_dac_clock(codec, rate);
} else {
- adav80x_set_capture_pcm_format(codec, dai,
- params_format(params));
+ adav80x_set_capture_pcm_format(codec, dai, params);
adav80x_set_adc_clock(codec, rate);
}
adav80x->rate = rate;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format
2014-01-08 18:51 [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format Mark Brown
` (3 preceding siblings ...)
2014-01-08 18:51 ` [PATCH 5/5] ASoC: adav80x: " Mark Brown
@ 2014-01-09 10:27 ` Lars-Peter Clausen
2014-01-09 14:00 ` Mark Brown
4 siblings, 1 reply; 7+ messages in thread
From: Lars-Peter Clausen @ 2014-01-09 10:27 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, linaro-kernel, Liam Girdwood, Mark Brown
On 01/08/2014 07:51 PM, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
It would have been nice to have a least a small explanation why this is a
better approach. It might not be immediately obvious to somebody reading the
log later on.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
All five patches in this series
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Thanks.
> ---
> sound/soc/codecs/ad1836.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
> index d7c983862cf0..77f459868579 100644
> --- a/sound/soc/codecs/ad1836.c
> +++ b/sound/soc/codecs/ad1836.c
> @@ -168,15 +168,15 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream,
> int word_len = 0;
>
> /* bit size */
> - switch (params_format(params)) {
> - case SNDRV_PCM_FORMAT_S16_LE:
> + switch (params_width(params)) {
> + case 16:
> word_len = AD1836_WORD_LEN_16;
> break;
> - case SNDRV_PCM_FORMAT_S20_3LE:
> + case 20:
> word_len = AD1836_WORD_LEN_20;
> break;
> - case SNDRV_PCM_FORMAT_S24_LE:
> - case SNDRV_PCM_FORMAT_S32_LE:
> + case 24:
> + case 32:
> word_len = AD1836_WORD_LEN_24;
> break;
> default:
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit memory format
2014-01-09 10:27 ` [PATCH 1/5] ASoC: ad1836: Use params_width() rather than explicit " Lars-Peter Clausen
@ 2014-01-09 14:00 ` Mark Brown
0 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2014-01-09 14:00 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: alsa-devel, linaro-kernel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 557 bytes --]
On Thu, Jan 09, 2014 at 11:27:27AM +0100, Lars-Peter Clausen wrote:
> On 01/08/2014 07:51 PM, Mark Brown wrote:
> > From: Mark Brown <broonie@linaro.org>
> It would have been nice to have a least a small explanation why this is a
> better approach. It might not be immediately obvious to somebody reading the
> log later on.
OTOH it does get rather tiresome with repetitive changes - even where
there's some notes generally the thing to do is look at the patch
implementing the new API to figure out why it's better (not that this is
much help here yet).
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread