linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/9] ASoC: simple-card: Support setting mclk via a fixed factor
Date: Sat,  3 May 2014 20:30:15 +0200	[thread overview]
Message-ID: <1399141819-23924-6-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1399141819-23924-1-git-send-email-andrew@lunn.ch>

Some platforms require that the codecs mclk is a fixed multiplication
factor of the audio stream rate. Add a optional property to the
binding to hold this factor and implement a hw_params() function to
make use of it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v1->v2:
s/factor/fs/g
---
 .../devicetree/bindings/sound/simple-card.txt      |  2 ++
 sound/soc/generic/simple-card.c                    | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 131aa2ad7f1a..34d1b845edcc 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -18,6 +18,8 @@ Optional properties:
 					  Each entry is a pair of strings, the first being the
 					  connection's sink, the second being the connection's
 					  source.
+- simple-audio-card,mclk-fs		: Multiplication factor between stream rate and codec
+					  mclk.
 - dai-tdm-slot-num			: Please refer to tdm-slot.txt.
 - dai-tdm-slot-width			: Please refer to tdm-slot.txt.
 
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 21f1ccbdf582..e5a3be97096c 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -24,6 +24,7 @@ struct simple_card_data {
 		struct asoc_simple_dai cpu_dai;
 		struct asoc_simple_dai codec_dai;
 	} *dai_props;
+	unsigned int mclk_fs;
 	struct snd_soc_dai_link dai_link[];	/* dynamically allocated */
 };
 
@@ -151,6 +152,28 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
 	return 0;
 }
 
+static int simple_card_hw_params(struct snd_pcm_substream *substream,
+				 struct snd_pcm_hw_params *params)
+{
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
+	unsigned int mclk;
+	int ret = 0;
+
+	if (priv->mclk_fs) {
+		mclk = params_rate(params) * priv->mclk_fs;
+		ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
+					     SND_SOC_CLOCK_IN);
+	}
+
+	return ret;
+}
+
+static struct snd_soc_ops simple_card_ops = {
+	.hw_params = simple_card_hw_params,
+};
+
 static int simple_card_cpu_codec_of(struct device_node *node,
 				int daifmt,
 				struct snd_soc_dai_link *dai_link,
@@ -255,6 +278,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 		sprintf(name, "%s-%s", dai_link->cpu_dai_name,
 					dai_link->codec_dai_name);
 		dai_link->name = dai_link->stream_name = name;
+		dai_link->ops = &simple_card_ops;
 
 		if (!multi)
 			break;
@@ -263,6 +287,10 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 		dai_props++;
 	}
 
+	/* Factor to mclk, used in hw_params() */
+	of_property_read_u32(node, "simple-audio-card,mclk-fs",
+			     &priv->mclk_fs);
+
 	/* card name is created from CPU/CODEC dai name */
 	dai_link = priv->snd_card.dai_link;
 	if (!priv->snd_card.name)
-- 
2.0.0.rc0

  parent reply	other threads:[~2014-05-03 18:30 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-03 18:30 [PATCH v2 0/9] DT instantiation of sound on T5325 Andrew Lunn
2014-05-03 18:30 ` [PATCH v2 1/9] ASoC: alc5623: Add device tree binding Andrew Lunn
2014-05-04 17:49   ` Jason Cooper
2014-05-20 22:12   ` Mark Brown
2014-05-03 18:30 ` [PATCH v2 2/9] ARM: Kirkwood: Remove platform driver for codec Andrew Lunn
2014-05-05  1:12   ` Jason Cooper
2014-05-03 18:30 ` [PATCH v2 3/9] ARM: Kirkwood: Add node for audio codec Andrew Lunn
2014-05-05  1:21   ` Jason Cooper
2014-05-03 18:30 ` [PATCH v2 4/9] ARM: Kirkwood: DT: Add missing #sound-dai-cells property Andrew Lunn
2014-05-03 18:30 ` Andrew Lunn [this message]
2014-05-04 17:50   ` [PATCH v2 5/9] ASoC: simple-card: Support setting mclk via a fixed factor Jason Cooper
2014-05-20 22:13   ` Mark Brown
2014-05-22 15:31     ` [PATCH v3 " Andrew Lunn
2014-05-22 17:39       ` Mark Brown
2014-05-22 17:52         ` Andrew Lunn
2014-05-22 18:30           ` Mark Brown
2014-05-22 19:10             ` Andrew Lunn
2014-05-22 19:23               ` Mark Brown
2014-05-26 13:29       ` Mark Brown
2014-05-03 18:30 ` [PATCH v2 6/9] ARM: Kirkwood: t5325: Remove platform device to instantiate audio Andrew Lunn
2014-05-03 18:30 ` [PATCH v2 7/9] ARM: Kirkwood: t5325: Use simple card " Andrew Lunn
2014-05-03 18:30 ` [PATCH v2 8/9] ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325 Andrew Lunn
2014-05-05  1:23   ` Jason Cooper
2014-05-03 18:30 ` [PATCH v2 9/9] ARM: multi_v5_defconfig: " Andrew Lunn
2014-05-08 17:37 ` [PATCH v2 0/9] DT instantiation of sound on T5325 Andrew Lunn
2014-05-20 21:47   ` Mark Brown
2014-05-20 21:53     ` Andrew Lunn

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=1399141819-23924-6-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 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 NNTP newsgroup(s).