Unverified Commit 54cd97cf authored by Sugar Zhang's avatar Sugar Zhang Committed by Mark Brown
Browse files

ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value 



This patch fix the wrong reg value for rk322x/rk322xh,
cuz there is no STORE JUSTIFIED MODE on it.

on rk322x/rk322xh, the same bit means PDM_MODE/RESERVED,
if the bit is set to RESERVED, the controller will not work.

Signed-off-by: default avatarSugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 430f5da6

sound/soc/rockchip/rockchip_pdm.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -210,7 +210,9 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, 
	regmap_update_bits(pdm->regmap, PDM_HPF_CTRL,

	regmap_update_bits(pdm->regmap, PDM_HPF_CTRL,

			   PDM_HPF_LE | PDM_HPF_RE, PDM_HPF_LE | PDM_HPF_RE);

			   PDM_HPF_LE | PDM_HPF_RE, PDM_HPF_LE | PDM_HPF_RE);

	regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_CLK_EN, PDM_CLK_EN);

	regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_CLK_EN, PDM_CLK_EN);

	regmap_update_bits(pdm->regmap, PDM_CTRL0, PDM_MODE_MSK, PDM_MODE_LJ);

	if (pdm->version != RK_PDM_RK3229)

		regmap_update_bits(pdm->regmap, PDM_CTRL0,

				   PDM_MODE_MSK, PDM_MODE_LJ);





	val = 0;

	val = 0;

	switch (params_format(params)) {

	switch (params_format(params)) {
@@ -455,7 +457,8 @@ static const struct regmap_config rockchip_pdm_regmap_config = { 
};

};





static const struct of_device_id rockchip_pdm_match[] = {

static const struct of_device_id rockchip_pdm_match[] = {

	{ .compatible = "rockchip,pdm", },

	{ .compatible = "rockchip,pdm",

	  .data = (void *)RK_PDM_RK3229 },

	{ .compatible = "rockchip,px30-pdm",

	{ .compatible = "rockchip,px30-pdm",

	  .data = (void *)RK_PDM_RK3308 },

	  .data = (void *)RK_PDM_RK3308 },

	{ .compatible = "rockchip,rk1808-pdm",

	{ .compatible = "rockchip,rk1808-pdm",

CRA Git | Maintained and supported by SUSTech CRA and CCSE