From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: heiko@sntech.de, broonie@kernel.org
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v1 12/12] ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value
Date: Thu, 4 Apr 2019 11:57:57 +0800 [thread overview]
Message-ID: <1554350277-24561-1-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1554298856-59028-1-git-send-email-sugar.zhang@rock-chips.com>
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>
---
sound/soc/rockchip/rockchip_pdm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
index e89beeb..6c0f242 100644
--- a/sound/soc/rockchip/rockchip_pdm.c
+++ b/sound/soc/rockchip/rockchip_pdm.c
@@ -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)) {
@@ -468,7 +470,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",
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: heiko@sntech.de, broonie@kernel.org
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Sugar Zhang <sugar.zhang@rock-chips.com>,
linux-rockchip@lists.infradead.org,
Jaroslav Kysela <perex@perex.cz>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 12/12] ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value
Date: Thu, 4 Apr 2019 11:57:57 +0800 [thread overview]
Message-ID: <1554350277-24561-1-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1554298856-59028-1-git-send-email-sugar.zhang@rock-chips.com>
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>
---
sound/soc/rockchip/rockchip_pdm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
index e89beeb..6c0f242 100644
--- a/sound/soc/rockchip/rockchip_pdm.c
+++ b/sound/soc/rockchip/rockchip_pdm.c
@@ -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)) {
@@ -468,7 +470,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",
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-04-04 3:58 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 13:40 [PATCH v1 0/12] Patches to update pdm for rockchip socs Sugar Zhang
2019-04-03 13:40 ` [PATCH v1 01/12] ASoC: rockchip: pdm: fix regmap_ops hang issue Sugar Zhang
2019-04-04 8:17 ` Applied "ASoC: rockchip: pdm: fix regmap_ops hang issue" to the asoc tree Mark Brown
2019-04-04 8:17 ` Mark Brown
2019-04-04 8:17 ` Mark Brown
2019-04-04 8:17 ` Mark Brown
2019-04-03 13:40 ` [PATCH v1 02/12] ASoC: rockchip: pdm: using left justified store mode Sugar Zhang
2019-04-04 7:51 ` Mark Brown
2019-04-04 7:51 ` Mark Brown
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: using left justified store mode" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-03 13:40 ` [PATCH v1 03/12] ASoC: rockchip: pdm: add default regs Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: add default regs" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-03 13:40 ` [PATCH v1 04/12] ASoC: rockchip: pdm: optimize clear logic Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: optimize clear logic" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:48 ` [PATCH v1 05/12] ASoC: rockchip: pdm: change dma burst to 8 Sugar Zhang
2019-04-04 3:48 ` Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: change dma burst to 8" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:51 ` [PATCH v1 06/12] ASoC: rockchip: pdm: fixup pdm fractional div Sugar Zhang
2019-04-04 3:51 ` Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: fixup pdm fractional div" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:53 ` [PATCH v1 07/12] dt-bindings: sound: rockchip: add compatible for rk3308/px30 Sugar Zhang
2019-04-04 3:53 ` Sugar Zhang
2019-04-04 8:16 ` Applied "dt-bindings: sound: rockchip: add compatible for rk3308/px30" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:54 ` [PATCH v1 08/12] ASoC: rockchip: pdm: add compatible for rk1808 Sugar Zhang
2019-04-04 3:54 ` Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: add compatible for rk1808" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:55 ` [PATCH v1 09/12] dt-bindings: sound: add compatible for rk1808 Sugar Zhang
2019-04-04 3:55 ` Sugar Zhang
2019-04-04 8:16 ` Applied "dt-bindings: sound: add compatible for rk1808" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:56 ` [PATCH v1 10/12] ASoC: rockchip: pdm: adjust waterlevel in frame unit Sugar Zhang
2019-04-04 3:56 ` Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: adjust waterlevel in frame unit" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:57 ` [PATCH v1 11/12] ASoC: rockchip: pdm: Mark RXFIFO_DATA as volatile and precious Sugar Zhang
2019-04-04 3:57 ` Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: Mark RXFIFO_DATA as volatile and precious" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 3:57 ` Sugar Zhang [this message]
2019-04-04 3:57 ` [PATCH v1 12/12] ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value Sugar Zhang
2019-04-04 8:16 ` Applied "ASoC: rockchip: pdm: Correct PDM_CTRL0 reg value" to the asoc tree Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
2019-04-04 8:16 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1554350277-24561-1-git-send-email-sugar.zhang@rock-chips.com \
--to=sugar.zhang@rock-chips.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.