* [PATCH v1 0/2] patches to add support for rockchip rt5640 card
@ 2016-02-22 7:56 Sugar Zhang
2016-02-22 7:56 ` [PATCH v1 2/2] ASoC: rt5640: add master clock handling for rt5640 Sugar Zhang
[not found] ` <1456127815-68575-1-git-send-email-sugar.zhang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
0 siblings, 2 replies; 4+ messages in thread
From: Sugar Zhang @ 2016-02-22 7:56 UTC (permalink / raw
To: broonie, heiko
Cc: Sugar Zhang, Jaroslav Kysela, devicetree, alsa-devel,
linux-rockchip, Oder Chiou, linux-kernel, Kumar Gala,
Ian Campbell, Takashi Iwai, Liam Girdwood, Pawel Moll,
Rob Herring, Mark Rutland, Bard Liao, linux-arm-kernel
add default values for i2s registers from TRM.
rt5640: add master clock handing.
Sugar Zhang (2):
ASoC: rockchip: i2s: add default values for registers
ASoC: rt5640: add master clock handling for rt5640
Documentation/devicetree/bindings/sound/rt5640.txt | 3 +++
sound/soc/codecs/rt5640.c | 31 ++++++++++++++++++++++
sound/soc/codecs/rt5640.h | 2 ++
sound/soc/rockchip/rockchip_i2s.c | 10 +++++++
4 files changed, 46 insertions(+)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 2/2] ASoC: rt5640: add master clock handling for rt5640
2016-02-22 7:56 [PATCH v1 0/2] patches to add support for rockchip rt5640 card Sugar Zhang
@ 2016-02-22 7:56 ` Sugar Zhang
[not found] ` <1456127815-68575-1-git-send-email-sugar.zhang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
1 sibling, 0 replies; 4+ messages in thread
From: Sugar Zhang @ 2016-02-22 7:56 UTC (permalink / raw
To: broonie, heiko
Cc: Sugar Zhang, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Bard Liao, Oder Chiou, Liam Girdwood, Jaroslav Kysela,
Takashi Iwai, devicetree, linux-kernel, alsa-devel
enable/disable master clock when codec is active or not.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
Documentation/devicetree/bindings/sound/rt5640.txt | 3 +++
sound/soc/codecs/rt5640.c | 31 ++++++++++++++++++++++
sound/soc/codecs/rt5640.h | 2 ++
3 files changed, 36 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/rt5640.txt b/Documentation/devicetree/bindings/sound/rt5640.txt
index 9e62f6e..57fe646 100644
--- a/Documentation/devicetree/bindings/sound/rt5640.txt
+++ b/Documentation/devicetree/bindings/sound/rt5640.txt
@@ -12,6 +12,9 @@ Required properties:
Optional properties:
+- clocks: The phandle of the master clock to the CODEC
+- clock-names: Should be "mclk"
+
- realtek,in1-differential
- realtek,in2-differential
- realtek,in3-differential
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 11d032c..6cd84fb 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -1949,7 +1949,33 @@ static int rt5640_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
static int rt5640_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
+ struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
+ int ret;
+
switch (level) {
+ case SND_SOC_BIAS_ON:
+ break;
+
+ case SND_SOC_BIAS_PREPARE:
+ /*
+ * SND_SOC_BIAS_PREPARE is called while preparing for a
+ * transition to ON or away from ON. If current bias_level
+ * is SND_SOC_BIAS_ON, then it is preparing for a transition
+ * away from ON. Disable the clock in that case, otherwise
+ * enable it.
+ */
+ if (IS_ERR(rt5640->mclk))
+ break;
+
+ if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON) {
+ clk_disable_unprepare(rt5640->mclk);
+ } else {
+ ret = clk_prepare_enable(rt5640->mclk);
+ if (ret)
+ return ret;
+ }
+ break;
+
case SND_SOC_BIAS_STANDBY:
if (SND_SOC_BIAS_OFF == snd_soc_codec_get_bias_level(codec)) {
snd_soc_update_bits(codec, RT5640_PWR_ANLG1,
@@ -2088,6 +2114,11 @@ static int rt5640_probe(struct snd_soc_codec *codec)
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
+ /* Check if MCLK provided */
+ rt5640->mclk = devm_clk_get(codec->dev, "mclk");
+ if (PTR_ERR(rt5640->mclk) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
rt5640->codec = codec;
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF);
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 83a7150..1761c3a9 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -12,6 +12,7 @@
#ifndef _RT5640_H
#define _RT5640_H
+#include <linux/clk.h>
#include <sound/rt5640.h>
/* Info */
@@ -2097,6 +2098,7 @@ struct rt5640_priv {
struct snd_soc_codec *codec;
struct rt5640_platform_data pdata;
struct regmap *regmap;
+ struct clk *mclk;
int sysclk;
int sysclk_src;
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1 0/2] patches to add support for rockchip rt5640 card
[not found] ` <1456127815-68575-1-git-send-email-sugar.zhang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
@ 2016-02-22 11:04 ` Mark Brown
2016-02-23 0:57 ` sugar
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2016-02-22 11:04 UTC (permalink / raw
To: Sugar Zhang
Cc: heiko-4mtYJXux2i+zQB+pC5nmwQ, Jaroslav Kysela,
devicetree-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Oder Chiou,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Kumar Gala, Ian Campbell,
Takashi Iwai, Liam Girdwood, Pawel Moll, Rob Herring,
Mark Rutland, Bard Liao,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
On Mon, Feb 22, 2016 at 03:56:53PM +0800, Sugar Zhang wrote:
> Sugar Zhang (2):
> ASoC: rockchip: i2s: add default values for registers
> ASoC: rt5640: add master clock handling for rt5640
These appear to be commpletly unrelated patches so should each be sent
individually rather than as a series - that way there is no confusion
about them possibly depending on each other and they are easier to
review and apply.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 0/2] patches to add support for rockchip rt5640 card
2016-02-22 11:04 ` [PATCH v1 0/2] patches to add support for rockchip rt5640 card Mark Brown
@ 2016-02-23 0:57 ` sugar
0 siblings, 0 replies; 4+ messages in thread
From: sugar @ 2016-02-23 0:57 UTC (permalink / raw
To: Mark Brown
Cc: Oder Chiou, devicetree, alsa-devel, heiko, Pawel Moll,
Ian Campbell, Liam Girdwood, Takashi Iwai, linux-kernel,
linux-rockchip, Rob Herring, Kumar Gala, Bard Liao, Mark Rutland,
linux-arm-kernel
在 2/22/2016 19:04, Mark Brown 写道:
> On Mon, Feb 22, 2016 at 03:56:53PM +0800, Sugar Zhang wrote:
>
>> Sugar Zhang (2):
>> ASoC: rockchip: i2s: add default values for registers
>> ASoC: rt5640: add master clock handling for rt5640
>
> These appear to be commpletly unrelated patches so should each be sent
> individually rather than as a series - that way there is no confusion
> about them possibly depending on each other and they are easier to
> review and apply.
>
Got it, thanks.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-23 0:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-22 7:56 [PATCH v1 0/2] patches to add support for rockchip rt5640 card Sugar Zhang
2016-02-22 7:56 ` [PATCH v1 2/2] ASoC: rt5640: add master clock handling for rt5640 Sugar Zhang
[not found] ` <1456127815-68575-1-git-send-email-sugar.zhang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-02-22 11:04 ` [PATCH v1 0/2] patches to add support for rockchip rt5640 card Mark Brown
2016-02-23 0:57 ` sugar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).