From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

We have endpoint base functions - of_graph_get_next_endpoint() - of_graph_get_endpoint_count() - for_each_endpoint_of_node()

for_each_endpoint_of_node() loop finds endpoint.

ports { port@0 { (1) endpoint {...}; }; port@1 { (2) endpoint {...}; }; ... };

In above case, for_each_endpoint_of_node() loop finds endpoint as (1) -> (2) -> ... If we want to get port@0 -> port@1 -> ... instead of endpoint, we need do like below

for_each_endpoint_of_node(node, endpoint) { port = of_get_parent(endpoint); ... }

But port might have multi endpoints.

ports { port@0 { (1) endpoint@0 {...}; (2) endpoint@1 {...}; }; port@1 { (3) endpoint {...}; }; ... };

In such case, people want to have "port base" loop instead of "endpoints base" loop. This patch adds such functions/macros.

Link: https://lore.kernel.org/r/87pn29pc5w.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- drivers/of/property.c | 69 ++++++++++++++++++++++++++++++++++------ include/linux/of_graph.h | 14 ++++++++ 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/drivers/of/property.c b/drivers/of/property.c index 6c028632f425..bf3bdeeba2f9 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -650,15 +650,7 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, * parent port node. */ if (!prev) { - struct device_node *node; - - node = of_get_child_by_name(parent, "ports"); - if (node) - parent = node; - - port = of_get_child_by_name(parent, "port"); - of_node_put(node); - + port = of_graph_get_next_port(parent, NULL); if (!port) { pr_err("graph: no port node found in %pOF\n", parent); return NULL; @@ -685,14 +677,59 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, /* No more endpoints under this port, try the next one. */ prev = NULL;

+ port = of_graph_get_next_port(parent, port); + if (!port) + return NULL; + } +} +EXPORT_SYMBOL(of_graph_get_next_endpoint); + +/** + * of_graph_get_next_port() - get next port node + * @parent: pointer to the parent device node + * @prev: previous port node, or NULL to get first + * + * Return: An 'port' node pointer with refcount incremented. Refcount + * of the passed @prev node is decremented. + */ +struct device_node *of_graph_get_next_port(const struct device_node *parent, + struct device_node *prev) +{ + struct device_node *port = prev; + + if (!parent) + return NULL; + + /* + * Start by locating the port node. If no previous endpoint is specified + * search for the first port node, otherwise get the previous endpoint + * parent port node. + */ + if (!port) { + struct device_node *node; + + node = of_get_child_by_name(parent, "ports"); + if (node) + parent = node; + + port = of_get_child_by_name(parent, "port"); + of_node_put(node); + + if (!port) { + pr_err("graph: no port node found in %pOF\n", parent); + return NULL; + } + } else { do { port = of_get_next_child(parent, port); if (!port) return NULL; } while (!of_node_name_eq(port, "port")); } + + return port; } -EXPORT_SYMBOL(of_graph_get_next_endpoint); +EXPORT_SYMBOL(of_graph_get_next_port);

/** * of_graph_get_endpoint_by_regs() - get endpoint node of specific identifiers @@ -819,6 +856,18 @@ int of_graph_get_endpoint_count(const struct device_node *np) } EXPORT_SYMBOL(of_graph_get_endpoint_count);

+int of_graph_get_port_count(const struct device_node *np) +{ + struct device_node *port; + int num = 0; + + for_each_port_of_node(np, port) + num++; + + return num; +} +EXPORT_SYMBOL(of_graph_get_port_count); + /** * of_graph_get_remote_node() - get remote parent device_node for given port/endpoint * @node: pointer to parent device_node containing graph port/endpoint diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h index 4d7756087b6b..8cd3bd674ebd 100644 --- a/include/linux/of_graph.h +++ b/include/linux/of_graph.h @@ -26,6 +26,17 @@ struct of_endpoint { const struct device_node *local_node; };

+/** + * for_each_port_of_node - iterate over every port in a device node + * @parent: parent device node containing ports and port + * @child: loop variable pointing to the current port node + * + * When breaking out of the loop, of_node_put(child) has to be called manually. + */ +#define for_each_port_of_node(parent, child) \ + for (child = of_graph_get_next_port(parent, NULL); child != NULL; \ + child = of_graph_get_next_port(parent, child)) + /** * for_each_endpoint_of_node - iterate over every endpoint in a device node * @parent: parent device node containing ports and endpoints @@ -41,8 +52,11 @@ struct of_endpoint { bool of_graph_is_present(const struct device_node *node); int of_graph_parse_endpoint(const struct device_node *node, struct of_endpoint *endpoint); +int of_graph_get_port_count(const struct device_node *np); int of_graph_get_endpoint_count(const struct device_node *np); struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id); +struct device_node *of_graph_get_next_port(const struct device_node *parent, + struct device_node *previous); struct device_node *of_graph_get_next_endpoint(const struct device_node *parent, struct device_node *previous); struct device_node *of_graph_get_endpoint_by_regs(

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

This patch adds test-component sound device YAML bindings. It can be used for Sound Test/Debug.

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- .../bindings/sound/test-component.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/test-component.yaml

diff --git a/Documentation/devicetree/bindings/sound/test-component.yaml b/Documentation/devicetree/bindings/sound/test-component.yaml new file mode 100644 index 000000000000..62a6ecad0e88 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/test-component.yaml @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/test-component.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Test Component Device Tree Bindings + +maintainers: + - Kuninori Morimoto kuninori.morimoto.gx@renesas.com + +properties: + compatible: + enum: + - test-cpu + - test-cpu-vv + - test-cpu-vn + - test-cpu-nv + - test-codec + - test-codec-vv + - test-codec-vn + - test-codec-nv + +required: + - compatible + +additionalProperties: true + +examples: + - | + test_cpu { + compatible = "test-cpu"; + };

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

audio-graph-card2 will support DPCM/Multi/Codec2Codec, and these will use almost same DT settings which uses ports0 and ports1. This patch adds asoc_graph_is_ports0() which checks port is under port0 or not.

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/simple_card_utils.h | 1 + sound/soc/generic/simple-card-utils.c | 28 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+)

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 51b3b485a92e..520559b0a336 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -180,6 +180,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, int asoc_simple_remove(struct platform_device *pdev);

int asoc_graph_card_probe(struct snd_soc_card *card); +int asoc_graph_is_ports0(struct device_node *port);

#ifdef DEBUG static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 677f7da93b4b..31802b15afd4 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -759,6 +759,34 @@ int asoc_graph_card_probe(struct snd_soc_card *card) } EXPORT_SYMBOL_GPL(asoc_graph_card_probe);

+int asoc_graph_is_ports0(struct device_node *np) +{ + struct device_node *port, *ports, *ports0, *top; + int ret; + + /* np is "endpoint" or "port" */ + if (of_node_name_eq(np, "endpoint")) { + port = of_get_parent(np); + } else { + port = np; + of_node_get(port); + } + + ports = of_get_parent(port); + top = of_get_parent(ports); + ports0 = of_get_child_by_name(top, "ports"); + + ret = ports0 == ports; + + of_node_put(port); + of_node_put(ports); + of_node_put(ports0); + of_node_put(top); + + return ret; +} +EXPORT_SYMBOL_GPL(asoc_graph_is_ports0); + /* Module information */ MODULE_AUTHOR("Kuninori Morimoto kuninori.morimoto.gx@renesas.com"); MODULE_DESCRIPTION("ALSA SoC Simple Card Utils");

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

We already have audio-graph-card which is Of-graph base of general sound card driver.

It is also supporting DPCM connection, but was forcibly expanded. Thus, it is very difficult to add new features on it, for example Multi CPU/Codec support, Codec2Codec support, etc.

This patch adds more flexible new Audio Graph Card2 driver for it. audio-graph-card and audio-graph-card2 are similar, but don't have full compatibility.

Difference between audio-graph-card and audio-graph-card2 are

- audio-graph-card used "dais" to indicate DAI-links, audio-graph-card2 uses "links" to it.

- audio-graph-card used "phandle" to indicate bitclock/frame-master, audio-graph-card2 uses flag to it.

- audio-graph-card used "format" to indicate DAI format, audio-graph-card2 assumes CPU/Codec drivers have .get_fmt support.

Audio Graph Card2 supports very generic connection, but some users want to have its own settings, for example PLL settings, etc. For such case, it has customizing support. In users own driver, it can use Audio Graph Card2 parsing by using asoc_graph_parse_of2(), and doing its own customizing.

Because Audio Graph Card2 is still under experimental stage, it will indicate such warning when probing, and the DT syntax might be changed.

Link: https://lore.kernel.org/r/87k0xszlep.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/graph_card.h | 15 + sound/soc/generic/Kconfig | 8 + sound/soc/generic/Makefile | 2 + sound/soc/generic/audio-graph-card2.c | 659 ++++++++++++++++++++++++++ 4 files changed, 684 insertions(+) create mode 100644 sound/soc/generic/audio-graph-card2.c

diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h index 6f10bfb0d5ee..b3185783caa7 100644 --- a/include/sound/graph_card.h +++ b/include/sound/graph_card.h @@ -9,6 +9,21 @@

#include <sound/simple_card_utils.h>

+typedef int (*GRAPH_CUSTOM)(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li); + +struct graph_custom_hooks { + int (*hook_pre)(struct asoc_simple_priv *priv); + int (*hook_post)(struct asoc_simple_priv *priv); + GRAPH_CUSTOM custom_normal; +}; + int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev); +int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, + struct graph_custom_hooks *hooks); + +int audio_graph2_link_normal(struct asoc_simple_priv *priv, + struct device_node *lnk, struct link_info *li);

#endif /* __GRAPH_CARD_H */ diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig index bb734780669e..3385c488cd85 100644 --- a/sound/soc/generic/Kconfig +++ b/sound/soc/generic/Kconfig @@ -18,6 +18,14 @@ config SND_AUDIO_GRAPH_CARD with OF-graph DT bindings. It also support DPCM of multi CPU single Codec ststem.

+config SND_AUDIO_GRAPH_CARD2 + tristate "ASoC Audio Graph Sound Card2 support" + depends on OF + select SND_SIMPLE_CARD_UTILS + help + This option enables generic simple sound card support + with OF-graph DT bindings. + config SND_TEST_COMPONENT tristate "ASoC Test component sound support" depends on OF diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index 988bfd45d2e2..b480f47a330d 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -2,9 +2,11 @@ snd-soc-simple-card-utils-objs := simple-card-utils.o snd-soc-simple-card-objs := simple-card.o snd-soc-audio-graph-card-objs := audio-graph-card.o +snd-soc-audio-graph-card2-objs := audio-graph-card2.o snd-soc-test-component-objs := test-component.o

obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o obj-$(CONFIG_SND_AUDIO_GRAPH_CARD) += snd-soc-audio-graph-card.o +obj-$(CONFIG_SND_AUDIO_GRAPH_CARD2) += snd-soc-audio-graph-card2.o obj-$(CONFIG_SND_TEST_COMPONENT) += snd-soc-test-component.o diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c new file mode 100644 index 000000000000..f5edf1368e12 --- /dev/null +++ b/sound/soc/generic/audio-graph-card2.c @@ -0,0 +1,659 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// ASoC Audio Graph Sound Card2 support +// +// Copyright (C) 2020 Renesas Solutions Corp. +// Kuninori Morimoto kuninori.morimoto.gx@renesas.com +// +// based on ${LINUX}/sound/soc/generic/audio-graph-card.c +#include <linux/clk.h> +#include <linux/device.h> +#include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_gpio.h> +#include <linux/of_graph.h> +#include <linux/platform_device.h> +#include <linux/string.h> +#include <sound/graph_card.h> + +/************************************ + daifmt + ************************************ + ports { + format = "left_j"; + port@0 { + bitclock-master; + sample0: endpoint@0 { + frame-master; + }; + sample1: endpoint@1 { + format = "i2s"; + }; + }; + ... + }; + + You can set daifmt at ports/port/endpoint. + It uses *latest* format, and *share* master settings. + In above case, + sample0: left_j, bitclock-master, frame-master + sample1: i2s, bitclock-master + + NOTE is that card2 is assuming to use .get_fmt. + + If there was no settings, *Codec* will be + bitclock/frame master as default. + see + graph_parse_daifmt(). + + ************************************ + Normal Audio-Graph + ************************************ + + CPU <---> Codec + + sound { + compatible = "audio-graph-card2"; + links = <&cpu>; + }; + + CPU { + cpu: port { + bitclock-master; + frame-master; + cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; }; + }; + + Codec { + port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; }; + }; + +*/ + +enum graph_type { + GRAPH_NORMAL, +}; + +#define port_to_endpoint(port) of_get_child_by_name(port, "endpoint") + +static enum graph_type graph_get_type(struct asoc_simple_priv *priv, + struct device_node *link) +{ + struct device_node *top; + const char *string; + enum graph_type type = GRAPH_NORMAL; + int ret; + + /* link is port or ports */ + top = of_get_parent(link); + if (of_node_name_eq(top, "ports")) { + of_node_put(top); + top = of_get_parent(top); + } + + ret = of_property_read_string(top, "compatible", &string); + if (ret < 0) + goto end; + +end: +#ifdef DEBUG + { + const char *str = "Normal"; + + dev_dbg(dev, "%pOF (%s)", link, str); + } +#endif + of_node_put(top); + + return type; +} + +static const struct snd_soc_ops graph_ops = { + .startup = asoc_simple_startup, + .shutdown = asoc_simple_shutdown, + .hw_params = asoc_simple_hw_params, +}; + +static int graph_get_dai_id(struct device_node *ep) +{ + struct device_node *node; + struct device_node *endpoint; + struct of_endpoint info; + int i, id; + const u32 *reg; + int ret; + + /* use driver specified DAI ID if exist */ + ret = snd_soc_get_dai_id(ep); + if (ret != -ENOTSUPP) + return ret; + + /* use endpoint/port reg if exist */ + ret = of_graph_parse_endpoint(ep, &info); + if (ret == 0) { + /* + * Because it will count port/endpoint if it doesn't have "reg". + * But, we can't judge whether it has "no reg", or "reg = <0>" + * only of_graph_parse_endpoint(). + * We need to check "reg" property + */ + if (of_get_property(ep, "reg", NULL)) + return info.id; + + node = of_get_parent(ep); + reg = of_get_property(node, "reg", NULL); + of_node_put(node); + if (reg) + return info.port; + } + node = of_graph_get_port_parent(ep); + + /* + * Non HDMI sound case, counting port/endpoint on its DT + * is enough. Let's count it. + */ + i = 0; + id = -1; + for_each_endpoint_of_node(node, endpoint) { + if (endpoint == ep) + id = i; + i++; + } + + of_node_put(node); + + if (id < 0) + return -ENODEV; + + return id; +} + +static int asoc_simple_parse_dai(struct device_node *ep, + struct snd_soc_dai_link_component *dlc, + int *is_single_link) +{ + struct device_node *node; + struct of_phandle_args args; + int ret; + + if (!ep) + return 0; + + node = of_graph_get_port_parent(ep); + + /* Get dai->name */ + args.np = node; + args.args[0] = graph_get_dai_id(ep); + args.args_count = (of_graph_get_endpoint_count(node) > 1); + + /* + * FIXME + * + * Here, dlc->dai_name is pointer to CPU/Codec DAI name. + * If user unbinded CPU or Codec driver, but not for Sound Card, + * dlc->dai_name is keeping unbinded CPU or Codec + * driver's pointer. + * + * If user re-bind CPU or Codec driver again, ALSA SoC will try + * to rebind Card via snd_soc_try_rebind_card(), but because of + * above reason, it might can't bind Sound Card. + * Because Sound Card is pointing to released dai_name pointer. + * + * To avoid this rebind Card issue, + * 1) It needs to alloc memory to keep dai_name eventhough + * CPU or Codec driver was unbinded, or + * 2) user need to rebind Sound Card everytime + * if he unbinded CPU or Codec. + */ + ret = snd_soc_get_dai_name(&args, &dlc->dai_name); + if (ret < 0) + return ret; + + dlc->of_node = node; + + if (is_single_link) + *is_single_link = of_graph_get_endpoint_count(node) == 1; + + return 0; +} + +static void graph_parse_mclk_fs(struct device_node *ep, + struct simple_dai_props *props) +{ + struct device_node *port = of_get_parent(ep); + struct device_node *ports = of_get_parent(port); + + if (of_node_name_eq(ports, "ports")) + of_property_read_u32(ports, "mclk-fs", &props->mclk_fs); + of_property_read_u32(port, "mclk-fs", &props->mclk_fs); + of_property_read_u32(ep, "mclk-fs", &props->mclk_fs); + + of_node_put(port); + of_node_put(ports); +} + +static int graph_dai_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_dai *dai; + struct device *dev = rtd->dev; + int i; + + /* + * Indicate assumption for a while. + * It will be removed. + */ + for_each_rtd_dais(rtd, i, dai) + if (!dai->driver->ops || + !dai->driver->ops->auto_selectable_formats) { + dev_warn_once(dev, "audio-graph-card2 is assuming " + "DAI driver (%s) has .auto_selectable_formats\n", dai->name); + break; + } + + return asoc_simple_dai_init(rtd); +} + +static int graph_parse_node(struct asoc_simple_priv *priv, + struct device_node *ep, + struct link_info *li, + int idx, int *cpu) +{ + struct device *dev = simple_priv_to_dev(priv); + struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); + struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); + struct snd_soc_dai_link_component *dlc; + struct asoc_simple_dai *dai; + int ret; + + if (cpu) { + dlc = asoc_link_to_cpu(dai_link, idx); + dai = simple_props_to_dai_cpu(dai_props, idx); + } else { + dlc = asoc_link_to_codec(dai_link, idx); + dai = simple_props_to_dai_codec(dai_props, idx); + } + + graph_parse_mclk_fs(ep, dai_props); + + ret = asoc_simple_parse_dai(ep, dlc, cpu); + if (ret < 0) + return ret; + + ret = asoc_simple_parse_tdm(ep, dai); + if (ret < 0) + return ret; + + ret = asoc_simple_parse_clk(dev, ep, dai, dlc); + if (ret < 0) + return ret; + + return 0; +} + +static void graph_parse_daifmt(struct device_node *node, + unsigned int *daifmt, unsigned int *bit_frame) +{ + unsigned int fmt; + + /* + * see also above "daifmt" explanation + * and samples. + */ + + /* + * ports { + * (A) + * port { + * (B) + * endpoint { + * (C) + * }; + * }; + * }; + * }; + */ + + /* + * clock_provider: + * + * It can be judged it is provider + * if (A) or (B) or (C) has bitclock-master / frame-master flag. + * + * use "or" + */ + *bit_frame |= snd_soc_daifmt_parse_clock_provider_as_bitmap(node, NULL); + +#define update_daifmt(name) \ + if (!(*daifmt & SND_SOC_DAIFMT_##name##_MASK) && \ + (fmt & SND_SOC_DAIFMT_##name##_MASK)) \ + *daifmt |= fmt & SND_SOC_DAIFMT_##name##_MASK; + + /* + * format + * + * This function is called by (C) -> (B) -> (A) order. + * Set if applicable part was not yet set. + */ + fmt = snd_soc_daifmt_parse_format(node, NULL); + update_daifmt(FORMAT); + update_daifmt(CLOCK); + update_daifmt(INV); +} + +static int graph_link_init(struct asoc_simple_priv *priv, + struct device_node *ep, + struct link_info *li, + int is_cpu_node, + char *name) +{ + struct device *dev = simple_priv_to_dev(priv); + struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); + struct device_node *port = of_get_parent(ep); + struct device_node *ports = of_get_parent(port); + unsigned int daifmt = 0, daiclk = 0; + unsigned int bit_frame = 0; + + /* + * ports { + * (A) + * port { + * (B) + * endpoint { + * (C) + * }; + * }; + * }; + * }; + */ + graph_parse_daifmt(ep, &daifmt, &bit_frame); /* (C) */ + graph_parse_daifmt(port, &daifmt, &bit_frame); /* (B) */ + if (of_node_name_eq(ports, "ports")) + graph_parse_daifmt(ports, &daifmt, &bit_frame); /* (A) */ + + /* + * convert bit_frame + * We need to flip clock_provider if it was CPU node, + * because it is Codec base. + */ + daiclk = snd_soc_daifmt_clock_provider_from_bitmap(bit_frame); + if (is_cpu_node) + daiclk = snd_soc_daifmt_clock_provider_fliped(daiclk); + + if (daifmt) + dev_warn(dev, "don't use format. implemente .set_fmt instead (%pOFf)\n", port); + + dai_link->dai_fmt = daifmt | daiclk; + dai_link->init = graph_dai_init; + dai_link->ops = &graph_ops; + if (priv->ops) + dai_link->ops = priv->ops; + + return asoc_simple_set_dailink_name(dev, dai_link, name); +} + +int audio_graph2_link_normal(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li) +{ + struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); + struct device_node *cpu_port = lnk; + struct device_node *cpu_ep = port_to_endpoint(cpu_port); + struct device_node *codec_ep = of_graph_get_remote_endpoint(cpu_ep); + struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); + struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); + char dai_name[64]; + int ret, is_single_links = 0; + + ret = graph_parse_node(priv, cpu_ep, li, 0, &is_single_links); + if (ret < 0) + goto err; + + ret = graph_parse_node(priv, codec_ep, li, 0, NULL); + if (ret < 0) + goto err; + + snprintf(dai_name, sizeof(dai_name), + "%s-%s", cpus->dai_name, codecs->dai_name); + + asoc_simple_canonicalize_cpu(cpus, is_single_links); + + ret = graph_link_init(priv, cpu_ep, li, 1, dai_name); + if (ret < 0) + goto err; + +err: + of_node_put(cpu_ep); + of_node_put(codec_ep); + + return ret; +} +EXPORT_SYMBOL_GPL(audio_graph2_link_normal); + +static int graph_link(struct asoc_simple_priv *priv, + struct graph_custom_hooks *hooks, + enum graph_type gtype, + struct device_node *lnk, + struct link_info *li) +{ + struct device *dev = simple_priv_to_dev(priv); + GRAPH_CUSTOM func = NULL; + int ret = -EINVAL; + + switch (gtype) { + case GRAPH_NORMAL: + if (hooks && hooks->custom_normal) + func = hooks->custom_normal; + else + func = audio_graph2_link_normal; + break; + } + + if (!func) { + dev_err(dev, "non supported gtype (%d)\n", gtype); + goto err; + } + + ret = func(priv, lnk, li); + if (ret < 0) + goto err; + + li->link++; +err: + return ret; +} + +static int graph_count_normal(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li) +{ + /* + * CPU { + * => lnk: port { endpoint { .. }; }; + * }; + */ + li->num[li->link].cpus = 1; + li->num[li->link].codecs = 1; + + return 0; +} + +static int graph_count(struct asoc_simple_priv *priv, + struct graph_custom_hooks *hooks, + enum graph_type gtype, + struct device_node *lnk, + struct link_info *li) +{ + struct device *dev = simple_priv_to_dev(priv); + GRAPH_CUSTOM func = NULL; + int ret = -EINVAL; + + if (li->link >= SNDRV_MAX_LINKS) { + dev_err(dev, "too many links\n"); + return ret; + } + + switch (gtype) { + case GRAPH_NORMAL: + func = graph_count_normal; + break; + } + + if (!func) { + dev_err(dev, "non supported gtype (%d)\n", gtype); + goto err; + } + + ret = func(priv, lnk, li); + if (ret < 0) + goto err; + + li->link++; +err: + return ret; +} + +static int graph_for_each_link(struct asoc_simple_priv *priv, + struct graph_custom_hooks *hooks, + struct link_info *li, + int (*func)(struct asoc_simple_priv *priv, + struct graph_custom_hooks *hooks, + enum graph_type gtype, + struct device_node *lnk, + struct link_info *li)) +{ + struct of_phandle_iterator it; + struct device *dev = simple_priv_to_dev(priv); + struct device_node *node = dev->of_node; + struct device_node *lnk; + enum graph_type gtype; + int rc, ret; + + /* loop for all listed CPU port */ + of_for_each_phandle(&it, rc, node, "links", NULL, 0) { + lnk = it.node; + + gtype = graph_get_type(priv, lnk); + + ret = func(priv, hooks, gtype, lnk, li); + if (ret < 0) + return ret; + } + + return 0; +} + +int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, + struct graph_custom_hooks *hooks) +{ + struct snd_soc_card *card = simple_priv_to_card(priv); + struct link_info *li; + int ret; + + dev_warn(dev, "Audio Graph Card2 is still under Experimental stage\n"); + + li = devm_kzalloc(dev, sizeof(*li), GFP_KERNEL); + if (!li) + return -ENOMEM; + + card->probe = asoc_graph_card_probe; + card->owner = THIS_MODULE; + card->dev = dev; + + if ((hooks) && (hooks)->hook_pre) { + ret = (hooks)->hook_pre(priv); + if (ret < 0) + goto err; + } + + ret = graph_for_each_link(priv, hooks, li, graph_count); + if (!li->link) + ret = -EINVAL; + if (ret < 0) + goto err; + + ret = asoc_simple_init_priv(priv, li); + if (ret < 0) + goto err; + + priv->pa_gpio = devm_gpiod_get_optional(dev, "pa", GPIOD_OUT_LOW); + if (IS_ERR(priv->pa_gpio)) { + ret = PTR_ERR(priv->pa_gpio); + dev_err(dev, "failed to get amplifier gpio: %d\n", ret); + goto err; + } + + ret = asoc_simple_parse_widgets(card, NULL); + if (ret < 0) + goto err; + + ret = asoc_simple_parse_routing(card, NULL); + if (ret < 0) + goto err; + + memset(li, 0, sizeof(*li)); + ret = graph_for_each_link(priv, hooks, li, graph_link); + if (ret < 0) + goto err; + + ret = asoc_simple_parse_card_name(card, NULL); + if (ret < 0) + goto err; + + snd_soc_card_set_drvdata(card, priv); + + if ((hooks) && (hooks)->hook_post) { + ret = (hooks)->hook_post(priv); + if (ret < 0) + goto err; + } + + asoc_simple_debug_info(priv); + + ret = devm_snd_soc_register_card(dev, card); +err: + devm_kfree(dev, li); + + if ((ret < 0) && (ret != -EPROBE_DEFER)) + dev_err(dev, "parse error %d\n", ret); + + return ret; +} +EXPORT_SYMBOL_GPL(audio_graph2_parse_of); + +static int graph_probe(struct platform_device *pdev) +{ + struct asoc_simple_priv *priv; + struct device *dev = &pdev->dev; + + /* Allocate the private data and the DAI link array */ + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + return audio_graph2_parse_of(priv, dev, NULL); +} + +static const struct of_device_id graph_of_match[] = { + { .compatible = "audio-graph-card2", }, + {}, +}; +MODULE_DEVICE_TABLE(of, graph_of_match); + +static struct platform_driver graph_card = { + .driver = { + .name = "asoc-audio-graph-card2", + .pm = &snd_soc_pm_ops, + .of_match_table = graph_of_match, + }, + .probe = graph_probe, + .remove = asoc_simple_remove, +}; +module_platform_driver(graph_card); + +MODULE_ALIAS("platform:asoc-audio-graph-card2"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("ASoC Audio Graph Sound Card2"); +MODULE_AUTHOR("Kuninori Morimoto kuninori.morimoto.gx@renesas.com");

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

This patch adds Multi CPU/Codec support to audio-graph-card2. One note today is that ASoC doesn't support N CPUs to M CODECs (It supports "1 CPU to N Codecs" or "N CPUs to N Codecs"). Multi CPU/Codec support needs to have extra node (X) to indicate it.

<- multi_CPU -> <-- multi_Codec --> ****** CPU1 <--> * * <--> Codec1 CPU2 <--> * * <--> Codec2 ******

sound { compatible = "audio-graph-card2";

(A) links = <&multi>; };

(X) multi_CPU_CODEC { compatible = "audio-graph-card2-multi";

/* for CPU */ (B) multi: ports@0 { port@0 { mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; port@1 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; /* for Codec */ ports@1 { port@0 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; port@1 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; }; };

CPU { ports { bitclock-master; frame-master; port@0 { cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; port@1 { cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; }; };

Codec { ports { port@0 { codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; port@1 { codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; }; };

"links" need to indicate Multi connection's CPU node (A)(B).

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/graph_card.h | 3 + sound/soc/generic/audio-graph-card2.c | 173 ++++++++++++++++++++++++++ 2 files changed, 176 insertions(+)

diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h index 03df4c5a7151..d0ccb7afda78 100644 --- a/include/sound/graph_card.h +++ b/include/sound/graph_card.h @@ -18,6 +18,7 @@ struct graph_custom_hooks { int (*hook_post)(struct asoc_simple_priv *priv); GRAPH_CUSTOM custom_normal; GRAPH_CUSTOM custom_dpcm; + GRAPH_CUSTOM custom_multi; };

int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev); @@ -28,5 +29,7 @@ int audio_graph2_link_normal(struct asoc_simple_priv *priv, struct device_node *lnk, struct link_info *li); int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, struct device_node *lnk, struct link_info *li); +int audio_graph2_link_multi(struct asoc_simple_priv *priv, + struct device_node *lnk, struct link_info *li);

#endif /* __GRAPH_CARD_H */ diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index b288975ffde2..ece0f7d28437 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -134,14 +134,66 @@ ... }; }; + + + ************************************ + Multi-CPU/Codec + ************************************ + +<- multi_CPU -> + <-- multi_Codec --> + ****** +CPU1 <--> * * <--> Codec1 +CPU2 <--> * * <--> Codec2 + ****** + *NOTE* + N cpus to M codecs is not yet supported + at ASoC framework for now. + + sound { + compatible = "audio-graph-card2"; + + links = <&multi>; + }; + + multi_CPU_CODEC { + compatible = "audio-graph-card2-multi"; + + multi: ports@0 { + port@0 { mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; + port@1 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; + }; + ports@1 { + port@0 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; + port@1 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; + }; +}; + + CPU { + ports { + bitclock-master; + frame-master; + port@0 { cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; + port@1 { cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; + }; + }; + + Codec { + ports { + port@0 { codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; + port@1 { codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; + }; + }; */

enum graph_type { GRAPH_NORMAL, GRAPH_DPCM, + GRAPH_MULTI, };

#define GRAPH_COMPATIBLE_DPCM "audio-graph-card2-dsp" +#define GRAPH_COMPATIBLE_MULTI "audio-graph-card2-multi"

#define port_to_endpoint(port) of_get_child_by_name(port, "endpoint")

@@ -166,6 +218,8 @@ static enum graph_type graph_get_type(struct asoc_simple_priv *priv,

if (strcmp(string, GRAPH_COMPATIBLE_DPCM) == 0) type = GRAPH_DPCM; + else if (strcmp(string, GRAPH_COMPATIBLE_MULTI) == 0) + type = GRAPH_MULTI; end: #ifdef DEBUG { @@ -179,6 +233,9 @@ static enum graph_type graph_get_type(struct asoc_simple_priv *priv, else str = "DPCM Back-End"; break; + case GRAPH_MULTI: + str = "MULTI"; + break; default: break; } @@ -649,6 +706,78 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, } EXPORT_SYMBOL_GPL(audio_graph2_link_dpcm);

+int audio_graph2_link_multi(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li) +{ + struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); + struct device_node *top = of_get_parent(lnk); + struct device_node *first_rep = NULL; + struct device_node *ports = lnk; + struct device_node *port; + char dai_name[64]; + int is_cpu = 1; + int i; + + /* + * top: MULTI { + * compatible = "audio-graph-card2-multi"; + * + * // CPU + * loop-0 ports@0 { + * port@0 { ep: endpoint { remote-endpoint = <&r_ep>; }; }; + * ... + * }; + * // Codec + * loop-1 ports@1 { + * ... + * }; + * }; + */ +ports_loop: + i = 0; + for_each_port_of_node(ports, port) { + struct device_node *ep = port_to_endpoint(port); + struct device_node *rep = of_graph_get_remote_endpoint(ep); + int ret, is_single_links = 0; + + if (!first_rep) + first_rep = rep; + + ret = graph_parse_node(priv, rep, li, i, + is_cpu ? &is_single_links : NULL); + + of_node_put(ep); + of_node_put(rep); + + if (ret < 0) + return ret; + + if (is_cpu) { + struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, i); + + asoc_simple_canonicalize_cpu(cpus, is_single_links); + } + + i++; + } + + /* + * 1st turn was for CPU ports (is_cpu = 1) + * 2nd turn is for Codec ports (is_cpu = 0) + */ + is_cpu--; + if (is_cpu == 0) { + ports = of_get_next_child(top, ports); + goto ports_loop; + } + + snprintf(dai_name, sizeof(dai_name), "multi-%pOFP", top); + + return graph_link_init(priv, first_rep, li, 1, dai_name); +} +EXPORT_SYMBOL_GPL(audio_graph2_link_multi); + static int graph_link(struct asoc_simple_priv *priv, struct graph_custom_hooks *hooks, enum graph_type gtype, @@ -672,6 +801,12 @@ static int graph_link(struct asoc_simple_priv *priv, else func = audio_graph2_link_dpcm; break; + case GRAPH_MULTI: + if (hooks && hooks->custom_multi) + func = hooks->custom_multi; + else + func = audio_graph2_link_multi; + break; }

if (!func) { @@ -734,6 +869,41 @@ static int graph_count_dsp(struct asoc_simple_priv *priv, return 0; }

+static int graph_count_multi(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li) +{ + struct device_node *top = of_get_parent(lnk); + struct device_node *cpu_ports = lnk; + struct device_node *codec_ports = of_get_next_child(top, cpu_ports); + + of_node_get(cpu_ports); /* for vs of_get_next_child() */ + + /* + * MULTI { + * compatible = "audio-graph-card2-multi"; + * + * // CPU + * => lnk: ports@0 { + * port@0 { endpoint { ... }; }; + * ... + * }; + * // Codec + * ports@1 { + * port@0 { endpoint { ... }; }; + * ... + * }; + * }; + */ + li->num[li->link].cpus = of_graph_get_port_count(cpu_ports); + li->num[li->link].codecs = of_graph_get_port_count(codec_ports); + + of_node_put(top); + of_node_put(codec_ports); + + return 0; +} + static int graph_count(struct asoc_simple_priv *priv, struct graph_custom_hooks *hooks, enum graph_type gtype, @@ -756,6 +926,9 @@ static int graph_count(struct asoc_simple_priv *priv, case GRAPH_DPCM: func = graph_count_dsp; break; + case GRAPH_MULTI: + func = graph_count_multi; + break; }

if (!func) {

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

This patch adds Audio Graph Card2 Yaml bindings. It is similar to Audio Graph Card, but different.

- audio-graph-card used "dais" to indicate DAI-links, audio-graph-card2 uses "links" to it.

- audio-graph-card used "phandle" to indicate bitclock/frame-master, audio-graph-card2 uses flag to it.

- audio-graph-card used "format" to indicate DAI format, audio-graph-card2 assumes CPU/Codec drivers have .get_fmt support.

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- .../sound/audio-graph-card2-items.yaml | 36 +++++++++ .../bindings/sound/audio-graph-card2.yaml | 45 +++++++++++ .../bindings/sound/audio-graph-port2.yaml | 74 +++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2-items.yaml create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2.yaml create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-port2.yaml

diff --git a/Documentation/devicetree/bindings/sound/audio-graph-card2-items.yaml b/Documentation/devicetree/bindings/sound/audio-graph-card2-items.yaml new file mode 100644 index 000000000000..40439f78df60 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/audio-graph-card2-items.yaml @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/audio-graph-card2-items.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Audio Graph Card2 Items Bindings + +maintainers: + - Kuninori Morimoto kuninori.morimoto.gx@renesas.com + +properties: + compatible: + enum: + - audio-graph-card2-dsp + - audio-graph-card2-multi + - audio-graph-card2-codec2codec + +required: + - compatible + +additionalProperties: true + +examples: + - | + mix { + compatible = "audio-graph-card2-dsp"; + }; + + multi { + compatible = "audio-graph-card2-multi"; + }; + + codec2codec { + compatible = "audio-graph-card2-codec2codec"; + }; diff --git a/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml b/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml new file mode 100644 index 000000000000..b5908ef144c1 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/audio-graph-card2.yaml @@ -0,0 +1,45 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/audio-graph-card2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Audio Graph Card2 Device Tree Bindings + +maintainers: + - Kuninori Morimoto kuninori.morimoto.gx@renesas.com + +properties: + compatible: + enum: + - audio-graph-card2 + links: + $ref: /schemas/types.yaml#/definitions/phandle-array + routing: + description: | + A list of the connections between audio components. + Each entry is a pair of strings, the first being the + connection's sink, the second being the connection's source. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + +required: + - compatible + - links + +unevaluatedProperties: false + +examples: + - | + sound { + compatible = "audio-graph-card2"; + + links = <&cpu_port>; + }; + + cpu { + cpu_port: port { cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; }; + }; + + codec { + port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; }; + }; diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port2.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port2.yaml new file mode 100644 index 000000000000..0a7753a140bf --- /dev/null +++ b/Documentation/devicetree/bindings/sound/audio-graph-port2.yaml @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/audio-graph-port.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Audio Graph Card2 'port' Node Bindings + +maintainers: + - Kuninori Morimoto kuninori.morimoto.gx@renesas.com + +select: false + +properties: + port: + description: single OF-Graph subnode + type: object + properties: + reg: + maxItems: 1 + prefix: + description: "device name prefix" + $ref: /schemas/types.yaml#/definitions/string + convert-rate: + description: CPU to Codec rate convert. + $ref: /schemas/types.yaml#/definitions/uint32 + convert-channels: + description: CPU to Codec rate channels. + $ref: /schemas/types.yaml#/definitions/uint32 + mclk-fs: + description: | + Multiplication factor between stream rate and codec mclk. + When defined, mclk-fs property defined in dai-link sub nodes are + ignored. + $ref: /schemas/types.yaml#/definitions/uint32 + patternProperties: + "^endpoint(@[0-9a-f]+)?": + type: object + properties: + remote-endpoint: + maxItems: 1 + mclk-fs: + description: | + Multiplication factor between stream rate and codec mclk. + When defined, mclk-fs property defined in dai-link sub nodes are + ignored. + $ref: /schemas/types.yaml#/definitions/uint32 + frame-inversion: + description: dai-link uses frame clock inversion + $ref: /schemas/types.yaml#/definitions/flag + bitclock-inversion: + description: dai-link uses bit clock inversion + $ref: /schemas/types.yaml#/definitions/flag + frame-master: + description: Indicates dai-link frame master. + $ref: /schemas/types.yaml#/definitions/flag + bitclock-master: + description: Indicates dai-link bit clock master + $ref: /schemas/types.yaml#/definitions/flag + convert-rate: + description: CPU to Codec rate convert. + $ref: /schemas/types.yaml#/definitions/uint32 + convert-channels: + description: CPU to Codec rate channels. + $ref: /schemas/types.yaml#/definitions/uint32 + + ports: + description: multi OF-Graph subnode + type: object + patternProperties: + "^port(@[0-9a-f]+)?": + $ref: "#/properties/port" + +additionalProperties: true

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

One of audio-graph-card issue was that it can't handle *user own* card settings. We can expand audio-graph-card if it was *generic* feature. Latest audio-graph-card has customizing support.

Audio Graph Card2 also have customize support. This means user can use its own special settings by using audio-graph-card2 driver parsing.

This patch adds Audio Graph Cars2 customize sample driver. It can get basic audio-graph-card2 setups by calling asoc_graph_parse_of2(...), and user can update/expand each own setting on it.

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/generic/Kconfig | 6 + sound/soc/generic/Makefile | 2 + sound/soc/generic/sample-custom-card.c | 160 +++++++++++++++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 sound/soc/generic/sample-custom-card.c

diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig index 3385c488cd85..c7cd0488e4fc 100644 --- a/sound/soc/generic/Kconfig +++ b/sound/soc/generic/Kconfig @@ -26,6 +26,12 @@ config SND_AUDIO_GRAPH_CARD2 This option enables generic simple sound card support with OF-graph DT bindings.

+config SND_SAMPLE_CUSTOM_CARD + tristate "ASoC Audio Graph Sound Card2 base custom card sample support" + depends on OF && SND_AUDIO_GRAPH_CARD2 + help + This option enables Audio Graph Sound Card2 base custom card support + config SND_TEST_COMPONENT tristate "ASoC Test component sound support" depends on OF diff --git a/sound/soc/generic/Makefile b/sound/soc/generic/Makefile index b480f47a330d..1b438202609c 100644 --- a/sound/soc/generic/Makefile +++ b/sound/soc/generic/Makefile @@ -3,10 +3,12 @@ snd-soc-simple-card-utils-objs := simple-card-utils.o snd-soc-simple-card-objs := simple-card.o snd-soc-audio-graph-card-objs := audio-graph-card.o snd-soc-audio-graph-card2-objs := audio-graph-card2.o +snd-soc-sample-custom-card-objs := sample-custom-card.o snd-soc-test-component-objs := test-component.o

obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) += snd-soc-simple-card-utils.o obj-$(CONFIG_SND_SIMPLE_CARD) += snd-soc-simple-card.o obj-$(CONFIG_SND_AUDIO_GRAPH_CARD) += snd-soc-audio-graph-card.o obj-$(CONFIG_SND_AUDIO_GRAPH_CARD2) += snd-soc-audio-graph-card2.o +obj-$(CONFIG_SND_SAMPLE_CUSTOM_CARD) += snd-soc-sample-custom-card.o obj-$(CONFIG_SND_TEST_COMPONENT) += snd-soc-test-component.o diff --git a/sound/soc/generic/sample-custom-card.c b/sound/soc/generic/sample-custom-card.c new file mode 100644 index 000000000000..e7b321fb5db9 --- /dev/null +++ b/sound/soc/generic/sample-custom-card.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// sample-custom-card.c +// +// Copyright (c) 2020 Kuninori Morimoto kuninori.morimoto.gx@renesas.com +// +#include <linux/module.h> +#include <linux/of_gpio.h> +#include <linux/platform_device.h> +#include <sound/graph_card.h> + +/* + * Custom driver can have own priv + * which includes asoc_simple_priv. + */ +struct custom_priv { + struct asoc_simple_priv simple_priv; + + /* custom driver's own params */ + int custom_params; +}; + +/* You can get custom_priv from simple_priv */ +#define simple_to_custom(simple) container_of((simple), struct custom_priv, simple_priv) + +static int custom_card_probe(struct snd_soc_card *card) +{ + struct asoc_simple_priv *simple_priv = snd_soc_card_get_drvdata(card); + struct custom_priv *custom_priv = simple_to_custom(simple_priv); + struct device *dev = simple_priv_to_dev(simple_priv); + + dev_info(dev, "custom probe\n"); + + custom_priv->custom_params = 1; + + /* you can use generic probe function */ + return asoc_graph_card_probe(card); +} + +static int custom_hook_pre(struct asoc_simple_priv *priv) +{ + struct device *dev = simple_priv_to_dev(priv); + + /* You can custom before parsing */ + dev_info(dev, "hook : %s\n", __func__); + + return 0; +} + +static int custom_hook_post(struct asoc_simple_priv *priv) +{ + struct device *dev = simple_priv_to_dev(priv); + struct snd_soc_card *card; + + /* You can custom after parsing */ + dev_info(dev, "hook : %s\n", __func__); + + card = simple_priv_to_card(priv); + card->probe = custom_card_probe; /* overwrite .probe */ + + return 0; +} + +static int custom_dpcm(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li) +{ + struct device *dev = simple_priv_to_dev(priv); + + /* You can custom for DPCM parsing */ + dev_info(dev, "hook : %s\n", __func__); + + return audio_graph2_link_dpcm(priv, lnk, li); +} + +static int custom_c2c(struct asoc_simple_priv *priv, + struct device_node *lnk, + struct link_info *li) +{ + struct device *dev = simple_priv_to_dev(priv); + + /* You can custom for Codec2Codec parsing */ + dev_info(dev, "hook : %s\n", __func__); + + return audio_graph2_link_c2c(priv, lnk, li); +} + +/* + * audio-graph-card2 has many hooks for your customizing. + */ +static struct graph_custom_hooks custom_hooks = { + .hook_pre = custom_hook_pre, + .hook_post = custom_hook_post, + .custom_dpcm = custom_dpcm, + .custom_c2c = custom_c2c, + /* and more ... */ +}; + +static int custom_startup(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct device *dev = simple_priv_to_dev(priv); + + dev_info(dev, "custom startup\n"); + + return asoc_simple_startup(substream); +} + +/* You can use custom ops */ +static const struct snd_soc_ops custom_ops = { + .startup = custom_startup, + .shutdown = asoc_simple_shutdown, + .hw_params = asoc_simple_hw_params, +}; + +static int custom_probe(struct platform_device *pdev) +{ + struct custom_priv *custom_priv; + struct asoc_simple_priv *simple_priv; + struct device *dev = &pdev->dev; + int ret; + + custom_priv = devm_kzalloc(dev, sizeof(*custom_priv), GFP_KERNEL); + if (!custom_priv) + return -ENOMEM; + + simple_priv = &custom_priv->simple_priv; + simple_priv->ops = &custom_ops; /* customize dai_link ops */ + + /* use audio-graph-card2 parsing with own custom hooks */ + ret = audio_graph2_parse_of(simple_priv, dev, &custom_hooks); + if (ret < 0) + return ret; + + /* customize more if needed */ + + return 0; +} + +static const struct of_device_id custom_of_match[] = { + { .compatible = "sample-custom-card", }, + {}, +}; +MODULE_DEVICE_TABLE(of, custom_of_match); + +static struct platform_driver custom_card = { + .driver = { + .name = "sample-custom-card", + .of_match_table = custom_of_match, + }, + .probe = custom_probe, + .remove = asoc_simple_remove, +}; +module_platform_driver(custom_card); + +MODULE_ALIAS("platform:asoc-sample-custom-card"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("ASoC Audio Graph Sound Card2 Custom"); +MODULE_AUTHOR("Kuninori Morimoto kuninori.morimoto.gx@renesas.com");

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

This patch adds DPCM sample to audio-graph-card2-sample.dtsi. This sample is assuming MIXer connection.

CPU2 --\ +-- Codec2 CPU3 --/

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- .../soc/generic/audio-graph-card2-sample.dtsi | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)

diff --git a/sound/soc/generic/audio-graph-card2-sample.dtsi b/sound/soc/generic/audio-graph-card2-sample.dtsi index 5e83bfed1781..9aab6be176e5 100644 --- a/sound/soc/generic/audio-graph-card2-sample.dtsi +++ b/sound/soc/generic/audio-graph-card2-sample.dtsi @@ -20,6 +20,8 @@ / { /* * cpu0 <--> codec0 // Normal * cpu1 <--> codec1 // Normal + * cpu2 <--> codec2 // DPCM + * cpu3 <-/ // DPCM */ card2 { /* @@ -30,10 +32,27 @@ card2 { */ compatible = "sample-custom-card";

+ routing = "TC DAI2 Playback", "DAI2 Playback", + "TC DAI2 Playback", "DAI3 Playback", + "DAI2 Capture", "TC DAI2 Capture", + "DAI3 Capture", "TC DAI2 Capture"; + links = <&cpu0 &cpu1 /* normal: cpu side only */ + &mix_fe0 &mix_fe1 &mix_be0 /* dsp : both fe/be */ >; };

+ mix { + compatible = "audio-graph-card2-dsp"; + DSP_FE: ports@0 { + mix_fe0: port@0 { mix_fe0_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; + mix_fe1: port@1 { mix_fe1_ep: endpoint { remote-endpoint = <&cpu3_ep>; }; }; + }; + DSP_BE: ports@1 { + mix_be0: port { mix_be0_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; + }; + }; + test_cpu { /* * update compatible to indicate more detail behaviour @@ -48,6 +67,8 @@ ports { frame-master; cpu0: port@0 { cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; }; cpu1: port@1 { cpu1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; + port@2 { cpu2_ep: endpoint { remote-endpoint = <&mix_fe0_ep>; }; }; + port@3 { cpu3_ep: endpoint { remote-endpoint = <&mix_fe1_ep>; }; }; }; };

@@ -61,8 +82,15 @@ test_codec { */ compatible = "test-codec"; ports { + /* + * prefix can be added to *component*, + * see card2::routing + */ + prefix = "TC"; + port@0 { codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; }; port@1 { codec1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; + port@2 { codec2_ep: endpoint { remote-endpoint = <&mix_be0_ep>; }; }; }; }; };

From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com

This patch adds Codec2Codec sample to audio-graph-card2-sample.dtsi. Because it can use very basic connection only for now, it can use only

- 2channels - S32_LE format

Test-Component driver has "IN" and "OUT" widget. Thus the route is

+--+ | | <-- Codec5 | | --> Codec6 +--+

(*) "IN" -> "DAI5 Capture" -> "DAI6 Playback" -> "OUT"

(*) routing is using "TC" prefix on this sample.

One note here is that it will start works when it boot. In other words we can't stop it so far. We need to update driver for it in the future.

Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- .../soc/generic/audio-graph-card2-sample.dtsi | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/sound/soc/generic/audio-graph-card2-sample.dtsi b/sound/soc/generic/audio-graph-card2-sample.dtsi index 1d18aba22011..f7cae9c480be 100644 --- a/sound/soc/generic/audio-graph-card2-sample.dtsi +++ b/sound/soc/generic/audio-graph-card2-sample.dtsi @@ -24,6 +24,8 @@ / { * cpu3 <-/ // DPCM * cpu4 <==> codec3 // Multi (*1) * cpu5 <==> codec4 // Multi (*1) + * /=> codec5 // Codec2Codec + * => codec6 // Codec2Codec */ card2 { /* @@ -37,11 +39,14 @@ card2 { routing = "TC DAI2 Playback", "DAI2 Playback", "TC DAI2 Playback", "DAI3 Playback", "DAI2 Capture", "TC DAI2 Capture", - "DAI3 Capture", "TC DAI2 Capture"; + "DAI3 Capture", "TC DAI2 Capture", + "TC OUT" ,"TC DAI6 Playback", + "TC DAI5 Capture", "TC IN";

links = <&cpu0 &cpu1 /* normal: cpu side only */ &mix_fe0 &mix_fe1 &mix_be0 /* dsp : both fe/be */ &multi_cpu /* multi : cpu side only */ + &c2c /* c2c : first one only */ >; };

@@ -76,6 +81,16 @@ multi_codec: ports@1 { }; };

+ codec2codec { + compatible = "audio-graph-card2-codec2codec"; + + rate = <48000>; + ports@1 { + c2c: port@0 { c2c_0_ep: endpoint { remote-endpoint = <&codec5_ep>; }; }; + port@1 { c2c_1_ep: endpoint { remote-endpoint = <&codec6_ep>; }; }; + }; + }; + test_cpu { /* * update compatible to indicate more detail behaviour @@ -118,6 +133,8 @@ ports { port@2 { codec2_ep: endpoint { remote-endpoint = <&mix_be0_ep>; }; }; port@3 { codec3_ep: endpoint { remote-endpoint = <&multi_10_ep>; }; }; port@4 { codec4_ep: endpoint { remote-endpoint = <&multi_11_ep>; }; }; + port@5 { codec5_ep: endpoint { remote-endpoint = <&c2c_0_ep>; }; }; + port@6 { codec6_ep: endpoint { remote-endpoint = <&c2c_1_ep>; }; }; }; }; };