]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value
authorSugar Zhang <sugar.zhang@rock-chips.com>
Thu, 4 Apr 2019 03:57:57 +0000 (11:57 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 4 Apr 2019 08:10:58 +0000 (15:10 +0700)
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: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/rockchip/rockchip_pdm.c

index 955cdc2b8fc5d26ef3491c87619cba91e1de220c..068453596470fc4d794a235b448d1ff639b2730e 100644 (file)
@@ -210,7 +210,9 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream,
        regmap_update_bits(pdm->regmap, PDM_HPF_CTRL,
                           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_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;
        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[] = {
-       { .compatible = "rockchip,pdm", },
+       { .compatible = "rockchip,pdm",
+         .data = (void *)RK_PDM_RK3229 },
        { .compatible = "rockchip,px30-pdm",
          .data = (void *)RK_PDM_RK3308 },
        { .compatible = "rockchip,rk1808-pdm",