* [PATCH] ASoC: simple-card: add support for aux devices
@ 2016-09-22 20:50 Nikita Yushchenko
2016-09-23 0:16 ` Kuninori Morimoto
0 siblings, 1 reply; 4+ messages in thread
From: Nikita Yushchenko @ 2016-09-22 20:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Mark Rutland,
Jaroslav Kysela, Takashi Iwai, Otto Kekäläinen,
Kuninori Morimoto, Mengdong Lin, Aaro Koskinen, Andrew Lunn,
Peter Ujfalusi, alsa-devel, devicetree, linux-kernel
Cc: Chris Healy, Nikita Yushchenko
This patch makes it possible to use simple-card in setups where separate
amplifier chip is connected to codec's output.
Example usage:
codec: tlv320dac3100@18 {
compatible = "ti,tlv320dac3100";
...
}
amp: tpa6130a2@60 {
compatible = "ti,tpa6130a2";
...
}
sound {
compatible = "simple-audio-card";
...
simple-audio-card,widgets =
"Headphone", "Headphone Jack";
simple-audio-card,routing =
"Headphone Jack", "HPLEFT",
"Headphone Jack", "HPRIGHT",
"LEFTIN", "HPL",
"RIGHTIN", "HPR";
simple-audio-card,aux-devs = <&>;
simple-audio-card,cpu {
sound-dai = <&ssi2>;
};
simple-audio-card,codec {
sound-dai = <&codec1>;
clocks = ...
};
This describes audio path from IMX6 SSI2 through TLV320DAC3100 codec
through TPA6130A2 amplifier to headphones.
Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
---
.../devicetree/bindings/sound/simple-card.txt | 2 ++
sound/soc/generic/simple-card.c | 34 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 59d8628..5579f40 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -22,6 +22,8 @@ Optional properties:
headphones are attached.
- simple-audio-card,mic-det-gpio : Reference to GPIO that signals when
a microphone is attached.
+- simple-audio-card,aux-devs : List of phandles pointing to auxiliary devices, such
+ as amplifiers, to be added to the sound card.
Optional subnodes:
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 43295f0..f989f34 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -417,6 +417,36 @@ dai_link_of_err:
return ret;
}
+static int asoc_simple_card_parse_aux_devs(struct device_node *node,
+ struct simple_card_data *priv)
+{
+ struct device *dev = simple_priv_to_dev(priv);
+ struct device_node *aux_node;
+ int i, n, len;
+
+ if (!of_find_property(node, PREFIX "aux-devs", &len))
+ return 0; /* Ok to have no aux-devs */
+
+ n = len / sizeof(__be32);
+ if (n <= 0)
+ return -EINVAL;
+
+ priv->snd_card.aux_dev = devm_kzalloc(dev,
+ n * sizeof(*priv->snd_card.aux_dev), GFP_KERNEL);
+ if (!priv->snd_card.aux_dev)
+ return -ENOMEM;
+
+ for (i = 0; i < n; i++) {
+ aux_node = of_parse_phandle(node, PREFIX "aux-devs", i);
+ if (!aux_node)
+ return -EINVAL;
+ priv->snd_card.aux_dev[i].codec_of_node = aux_node;
+ }
+
+ priv->snd_card.num_aux_devs = n;
+ return 0;
+}
+
static int asoc_simple_card_parse_of(struct device_node *node,
struct simple_card_data *priv)
{
@@ -474,6 +504,10 @@ static int asoc_simple_card_parse_of(struct device_node *node,
if (ret)
return ret;
+ ret = asoc_simple_card_parse_aux_devs(node, priv);
+ if (ret)
+ return ret;
+
return 0;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: simple-card: add support for aux devices
2016-09-22 20:50 [PATCH] ASoC: simple-card: add support for aux devices Nikita Yushchenko
@ 2016-09-23 0:16 ` Kuninori Morimoto
2016-09-23 6:44 ` Nikita Yushchenko
0 siblings, 1 reply; 4+ messages in thread
From: Kuninori Morimoto @ 2016-09-23 0:16 UTC (permalink / raw)
To: Nikita Yushchenko
Cc: Liam Girdwood, Mark Brown, Rob Herring, Mark Rutland,
Jaroslav Kysela, Takashi Iwai, Otto Kekäläinen,
Mengdong Lin, Aaro Koskinen, Andrew Lunn, Peter Ujfalusi,
alsa-devel, devicetree, linux-kernel, Chris Healy
Hi Nikita
> Example usage:
>
> codec: tlv320dac3100@18 {
> compatible = "ti,tlv320dac3100";
> ...
> }
>
> amp: tpa6130a2@60 {
> compatible = "ti,tpa6130a2";
> ...
> }
>
> sound {
> compatible = "simple-audio-card";
> ...
> simple-audio-card,widgets =
> "Headphone", "Headphone Jack";
> simple-audio-card,routing =
> "Headphone Jack", "HPLEFT",
> "Headphone Jack", "HPRIGHT",
> "LEFTIN", "HPL",
> "RIGHTIN", "HPR";
> simple-audio-card,aux-devs = <&>;
> simple-audio-card,cpu {
> sound-dai = <&ssi2>;
> };
> simple-audio-card,codec {
> sound-dai = <&codec1>;
> clocks = ...
> };
This case, I think you want ...
simple-audio-card,codec {
- sound-dai = <&codec1>;
+ sound-dai = <&codec>;
> diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
> index 59d8628..5579f40 100644
> --- a/Documentation/devicetree/bindings/sound/simple-card.txt
> +++ b/Documentation/devicetree/bindings/sound/simple-card.txt
> @@ -22,6 +22,8 @@ Optional properties:
> headphones are attached.
> - simple-audio-card,mic-det-gpio : Reference to GPIO that signals when
> a microphone is attached.
> +- simple-audio-card,aux-devs : List of phandles pointing to auxiliary devices, such
> + as amplifiers, to be added to the sound card.
>
> Optional subnodes:
I think it is very helpful if this document has above sample
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: simple-card: add support for aux devices
2016-09-23 0:16 ` Kuninori Morimoto
@ 2016-09-23 6:44 ` Nikita Yushchenko
0 siblings, 0 replies; 4+ messages in thread
From: Nikita Yushchenko @ 2016-09-23 6:44 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: Liam Girdwood, Mark Brown, Rob Herring, Mark Rutland,
Jaroslav Kysela, Takashi Iwai, Otto Kekäläinen,
Mengdong Lin, Aaro Koskinen, Andrew Lunn, Peter Ujfalusi,
alsa-devel, devicetree, linux-kernel, Chris Healy
Hi
> This case, I think you want ...
>
> simple-audio-card,codec {
> - sound-dai = <&codec1>;
> + sound-dai = <&codec>;
Oops... sure, thanks for noticing it.
>> a microphone is attached.
>> +- simple-audio-card,aux-devs : List of phandles pointing to auxiliary devices, such
>> + as amplifiers, to be added to the sound card.
>>
>> Optional subnodes:
>
> I think it is very helpful if this document has above sample
Ok, will send v2 with the example moved from commit message to
documentation.
Nikita
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoC: simple-card: add support for aux devices
2016-09-24 18:03 [PATCH v2] " Mark Brown
@ 2016-09-26 9:56 ` Nikita Yushchenko
0 siblings, 0 replies; 4+ messages in thread
From: Nikita Yushchenko @ 2016-09-26 9:56 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Mark Rutland,
Jaroslav Kysela, Takashi Iwai, Kuninori Morimoto, alsa-devel,
devicetree, linux-kernel
Cc: Chris Healy, Nikita Yushchenko
Add device tree property to define auxiliary devices to be added to
simle-audio-card.
Together with proper audio routing definition, this allows to use
simple-card in setups where separate amplifier chip is connected to
codec's output.
Signed-off-by: Nikita Yushchenko <nikita.yoush@cogentembedded.com>
---
Rebased against commit b0133d9c4d76 ("ASoC: simple-card: use kzalloc()
for dai_props / dai_link") in branch 'topic/simple' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
Updated patch description to mention audio routing.
.../devicetree/bindings/sound/simple-card.txt | 37 ++++++++++++++++++++++
sound/soc/generic/simple-card.c | 34 ++++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index cf3979eb3578..5ecdde6d9f63 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -22,6 +22,8 @@ Optional properties:
headphones are attached.
- simple-audio-card,mic-det-gpio : Reference to GPIO that signals when
a microphone is attached.
+- simple-audio-card,aux-devs : List of phandles pointing to auxiliary devices, such
+ as amplifiers, to be added to the sound card.
Optional subnodes:
@@ -162,3 +164,38 @@ sound {
};
};
};
+
+Example 3 - route audio from IMX6 SSI2 through TLV320DAC3100 codec
+through TPA6130A2 amplifier to headphones:
+
+&i2c0 {
+ codec: tlv320dac3100@18 {
+ compatible = "ti,tlv320dac3100";
+ ...
+ }
+
+ amp: tpa6130a2@60 {
+ compatible = "ti,tpa6130a2";
+ ...
+ }
+}
+
+sound {
+ compatible = "simple-audio-card";
+ ...
+ simple-audio-card,widgets =
+ "Headphone", "Headphone Jack";
+ simple-audio-card,routing =
+ "Headphone Jack", "HPLEFT",
+ "Headphone Jack", "HPRIGHT",
+ "LEFTIN", "HPL",
+ "RIGHTIN", "HPR";
+ simple-audio-card,aux-devs = <&>;
+ simple-audio-card,cpu {
+ sound-dai = <&ssi2>;
+ };
+ simple-audio-card,codec {
+ sound-dai = <&codec>;
+ clocks = ...
+ };
+};
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index fe0bc5c469e2..f608f8d23f3d 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -318,6 +318,36 @@ dai_link_of_err:
return ret;
}
+static int asoc_simple_card_parse_aux_devs(struct device_node *node,
+ struct simple_card_data *priv)
+{
+ struct device *dev = simple_priv_to_dev(priv);
+ struct device_node *aux_node;
+ int i, n, len;
+
+ if (!of_find_property(node, PREFIX "aux-devs", &len))
+ return 0; /* Ok to have no aux-devs */
+
+ n = len / sizeof(__be32);
+ if (n <= 0)
+ return -EINVAL;
+
+ priv->snd_card.aux_dev = devm_kzalloc(dev,
+ n * sizeof(*priv->snd_card.aux_dev), GFP_KERNEL);
+ if (!priv->snd_card.aux_dev)
+ return -ENOMEM;
+
+ for (i = 0; i < n; i++) {
+ aux_node = of_parse_phandle(node, PREFIX "aux-devs", i);
+ if (!aux_node)
+ return -EINVAL;
+ priv->snd_card.aux_dev[i].codec_of_node = aux_node;
+ }
+
+ priv->snd_card.num_aux_devs = n;
+ return 0;
+}
+
static int asoc_simple_card_parse_of(struct device_node *node,
struct simple_card_data *priv)
{
@@ -372,6 +402,10 @@ static int asoc_simple_card_parse_of(struct device_node *node,
}
ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);
+ if (ret < 0)
+ goto card_parse_end;
+
+ ret = asoc_simple_card_parse_aux_devs(node, priv);
card_parse_end:
of_node_put(dai_link);
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-26 9:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-22 20:50 [PATCH] ASoC: simple-card: add support for aux devices Nikita Yushchenko
2016-09-23 0:16 ` Kuninori Morimoto
2016-09-23 6:44 ` Nikita Yushchenko
2016-09-24 18:03 [PATCH v2] " Mark Brown
2016-09-26 9:56 ` [PATCH] " Nikita Yushchenko
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).