projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc0195a
)
ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt
author
Ben Zhang
<
[email protected]
>
Tue, 21 Jul 2015 21:46:26 +0000
(14:46 -0700)
committer
Mark Brown
<
[email protected]
>
Wed, 22 Jul 2015 09:54:22 +0000
(10:54 +0100)
The regmap_write in ssm4567_set_dai_fmt accidentally clears the
TDM_BCLKS field which was set earlier by ssm4567_set_tdm_slot.
This patch fixes it by using regmap_update_bits with proper mask.
Signed-off-by: Ben Zhang <
[email protected]
>
Acked-by: Lars-Peter Clausen <
[email protected]
>
Acked-by: Anatol Pomozov <
[email protected]
>
Signed-off-by: Mark Brown <
[email protected]
>
Cc:
[email protected]
sound/soc/codecs/ssm4567.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/ssm4567.c
b/sound/soc/codecs/ssm4567.c
index 938d2cb6d78bee03e809f02462b17f951f0c953a..84a4f5ad80645f2f45079ea35fe8ce19da901f09 100644
(file)
--- a/
sound/soc/codecs/ssm4567.c
+++ b/
sound/soc/codecs/ssm4567.c
@@
-315,7
+315,13
@@
static int ssm4567_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
if (invert_fclk)
ctrl1 |= SSM4567_SAI_CTRL_1_FSYNC;
- return regmap_write(ssm4567->regmap, SSM4567_REG_SAI_CTRL_1, ctrl1);
+ return regmap_update_bits(ssm4567->regmap, SSM4567_REG_SAI_CTRL_1,
+ SSM4567_SAI_CTRL_1_BCLK |
+ SSM4567_SAI_CTRL_1_FSYNC |
+ SSM4567_SAI_CTRL_1_LJ |
+ SSM4567_SAI_CTRL_1_TDM |
+ SSM4567_SAI_CTRL_1_PDM,
+ ctrl1);
}
static int ssm4567_set_power(struct ssm4567 *ssm4567, bool enable)