Patch "ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

    ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     asoc-ssm4567-keep-tdm_bclks-in-ssm4567_set_dai_fmt.patch

and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ben Zhang <[email protected]>
Date: Tue, 21 Jul 2015 14:46:26 -0700
Subject: ASoC: ssm4567: Keep TDM_BCLKS in ssm4567_set_dai_fmt

From: Ben Zhang <[email protected]>

commit a6c2a32ac83567f15e9af3dcbc73148ce68b2ced upstream.

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.

---
 sound/soc/codecs/ssm4567.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

@@ -315,7 +315,13 @@ static int ssm4567_set_dai_fmt(struct sn
 	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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/asoc-ssm4567-keep-tdm_bclks-in-ssm4567_set_dai_fmt.patch