Skip to content

Commit

Permalink
ASoC: core: use regmap's parse_val to do endian translation
Browse files Browse the repository at this point in the history
    In snd_soc_bytes_put function, it forces cpu to do cpu_to_be translation,
but for mmio bus which uses REGMAP_ENDIAN_NATIVE, it doesn't need to do
endian translation. So it is better to use regmap's api which can decide
if this translation is needed according to bus configuration.

Signed-off-by: Nenghua Cao <nhcao@marvell.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Nenghua Cao authored and Mark Brown committed Mar 6, 2014
1 parent d083f58 commit a1a564e
Showing 1 changed file with 29 additions and 5 deletions.
34 changes: 29 additions & 5 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3234,7 +3234,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
struct soc_bytes *params = (void *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
int ret, len;
unsigned int val;
unsigned int val, mask;
void *data;

if (!codec->using_regmap)
Expand Down Expand Up @@ -3264,12 +3264,36 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
((u8 *)data)[0] |= val;
break;
case 2:
((u16 *)data)[0] &= cpu_to_be16(~params->mask);
((u16 *)data)[0] |= cpu_to_be16(val);
mask = ~params->mask;
ret = regmap_parse_val(codec->control_data,
&mask, &mask);
if (ret != 0)
goto out;

((u16 *)data)[0] &= mask;

ret = regmap_parse_val(codec->control_data,
&val, &val);
if (ret != 0)
goto out;

((u16 *)data)[0] |= val;
break;
case 4:
((u32 *)data)[0] &= cpu_to_be32(~params->mask);
((u32 *)data)[0] |= cpu_to_be32(val);
mask = ~params->mask;
ret = regmap_parse_val(codec->control_data,
&mask, &mask);
if (ret != 0)
goto out;

((u32 *)data)[0] &= mask;

ret = regmap_parse_val(codec->control_data,
&val, &val);
if (ret != 0)
goto out;

((u32 *)data)[0] |= val;
break;
default:
ret = -EINVAL;
Expand Down

0 comments on commit a1a564e

Please sign in to comment.