Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e375d62 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/ssm4567' of... 

Merge branch 'fix/ssm4567' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567
parents beb89622 a6c2a32a

sound/soc/codecs/ssm4567.c

+7 −1
Original line number Diff line number Diff line
@@ -316,7 +316,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)