2018-07-02 14:30:28 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
//
|
|
|
|
// ASoC simple sound card support
|
|
|
|
//
|
|
|
|
// Copyright (C) 2012 Renesas Solutions Corp.
|
|
|
|
// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
|
|
|
|
2013-11-20 14:25:02 +08:00
|
|
|
#include <linux/clk.h>
|
2014-02-14 09:34:36 +08:00
|
|
|
#include <linux/device.h>
|
2012-04-09 12:17:50 +08:00
|
|
|
#include <linux/module.h>
|
2013-11-20 14:25:02 +08:00
|
|
|
#include <linux/of.h>
|
2019-04-04 08:52:52 +08:00
|
|
|
#include <linux/of_device.h>
|
2012-04-09 12:17:50 +08:00
|
|
|
#include <linux/platform_device.h>
|
2014-01-14 12:35:32 +08:00
|
|
|
#include <linux/string.h>
|
2012-04-09 12:17:50 +08:00
|
|
|
#include <sound/simple_card.h>
|
2014-02-14 09:34:36 +08:00
|
|
|
#include <sound/soc-dai.h>
|
|
|
|
#include <sound/soc.h>
|
2012-04-09 12:17:50 +08:00
|
|
|
|
2019-04-04 08:52:52 +08:00
|
|
|
#define DPCM_SELECTABLE 1
|
|
|
|
|
2016-08-08 14:02:07 +08:00
|
|
|
#define DAI "sound-dai"
|
|
|
|
#define CELL "#sound-dai-cells"
|
2016-05-31 16:59:01 +08:00
|
|
|
#define PREFIX "simple-audio-card,"
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
static const struct snd_soc_ops simple_ops = {
|
2019-03-20 12:55:14 +08:00
|
|
|
.startup = asoc_simple_startup,
|
2019-03-20 12:55:27 +08:00
|
|
|
.shutdown = asoc_simple_shutdown,
|
2019-03-20 12:55:39 +08:00
|
|
|
.hw_params = asoc_simple_hw_params,
|
2014-05-22 23:31:49 +08:00
|
|
|
};
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
static int asoc_simple_parse_dai(struct device_node *node,
|
|
|
|
struct snd_soc_dai_link_component *dlc,
|
|
|
|
int *is_single_link)
|
2019-03-20 12:56:36 +08:00
|
|
|
{
|
|
|
|
struct of_phandle_args args;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!node)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get node via "sound-dai = <&phandle port>"
|
|
|
|
* it will be used as xxx_of_node on soc_bind_dai_link()
|
|
|
|
*/
|
|
|
|
ret = of_parse_phandle_with_args(node, DAI, CELL, 0, &args);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2019-09-03 16:15:54 +08:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2019-06-06 12:07:35 +08:00
|
|
|
ret = snd_soc_of_get_dai_name(node, &dlc->dai_name);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2019-03-20 12:56:36 +08:00
|
|
|
|
2019-06-06 12:07:35 +08:00
|
|
|
dlc->of_node = args.np;
|
2019-03-20 12:56:36 +08:00
|
|
|
|
|
|
|
if (is_single_link)
|
|
|
|
*is_single_link = !args.args_count;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-03-18 12:50:08 +08:00
|
|
|
static void simple_parse_convert(struct device *dev,
|
|
|
|
struct device_node *np,
|
2019-03-20 12:56:50 +08:00
|
|
|
struct asoc_simple_data *adata)
|
2018-12-20 09:46:42 +08:00
|
|
|
{
|
|
|
|
struct device_node *top = dev->of_node;
|
|
|
|
struct device_node *node = of_get_parent(np);
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
asoc_simple_parse_convert(dev, top, PREFIX, adata);
|
|
|
|
asoc_simple_parse_convert(dev, node, PREFIX, adata);
|
|
|
|
asoc_simple_parse_convert(dev, node, NULL, adata);
|
|
|
|
asoc_simple_parse_convert(dev, np, NULL, adata);
|
2018-12-20 09:46:42 +08:00
|
|
|
|
|
|
|
of_node_put(node);
|
|
|
|
}
|
|
|
|
|
2019-03-18 12:50:17 +08:00
|
|
|
static void simple_parse_mclk_fs(struct device_node *top,
|
|
|
|
struct device_node *cpu,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct simple_dai_props *props,
|
|
|
|
char *prefix)
|
|
|
|
{
|
|
|
|
struct device_node *node = of_get_parent(cpu);
|
|
|
|
char prop[128];
|
|
|
|
|
|
|
|
snprintf(prop, sizeof(prop), "%smclk-fs", PREFIX);
|
|
|
|
of_property_read_u32(top, prop, &props->mclk_fs);
|
|
|
|
|
|
|
|
snprintf(prop, sizeof(prop), "%smclk-fs", prefix);
|
|
|
|
of_property_read_u32(node, prop, &props->mclk_fs);
|
|
|
|
of_property_read_u32(cpu, prop, &props->mclk_fs);
|
|
|
|
of_property_read_u32(codec, prop, &props->mclk_fs);
|
|
|
|
|
|
|
|
of_node_put(node);
|
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:34 +08:00
|
|
|
struct device_node *np,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct link_info *li,
|
|
|
|
bool is_top)
|
2018-12-14 10:35:10 +08:00
|
|
|
{
|
|
|
|
struct device *dev = simple_priv_to_dev(priv);
|
2018-12-20 09:46:53 +08:00
|
|
|
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);
|
2018-12-14 10:35:10 +08:00
|
|
|
struct asoc_simple_dai *dai;
|
2019-06-06 12:07:35 +08:00
|
|
|
struct snd_soc_dai_link_component *cpus = dai_link->cpus;
|
2018-12-14 10:35:24 +08:00
|
|
|
struct snd_soc_dai_link_component *codecs = dai_link->codecs;
|
2018-12-20 09:47:23 +08:00
|
|
|
struct device_node *top = dev->of_node;
|
|
|
|
struct device_node *node = of_get_parent(np);
|
2018-12-14 10:35:10 +08:00
|
|
|
char *prefix = "";
|
|
|
|
int ret;
|
|
|
|
|
2018-12-20 09:47:23 +08:00
|
|
|
/*
|
|
|
|
* |CPU |Codec : turn
|
|
|
|
* CPU |Pass |return
|
|
|
|
* Codec |return|Pass
|
|
|
|
* np
|
|
|
|
*/
|
|
|
|
if (li->cpu == (np == codec))
|
|
|
|
return 0;
|
|
|
|
|
2018-12-20 09:46:53 +08:00
|
|
|
dev_dbg(dev, "link_of DPCM (%pOF)\n", np);
|
|
|
|
|
|
|
|
li->link++;
|
|
|
|
|
2018-12-14 10:35:10 +08:00
|
|
|
/* For single DAI link & old style of DT node */
|
2018-12-20 09:47:23 +08:00
|
|
|
if (is_top)
|
2018-12-14 10:35:10 +08:00
|
|
|
prefix = PREFIX;
|
|
|
|
|
2018-12-20 09:47:23 +08:00
|
|
|
if (li->cpu) {
|
2018-12-14 10:35:10 +08:00
|
|
|
int is_single_links = 0;
|
|
|
|
|
2019-10-15 10:52:41 +08:00
|
|
|
/* Codec is dummy */
|
2018-12-14 10:35:10 +08:00
|
|
|
codecs->of_node = NULL;
|
|
|
|
codecs->dai_name = "snd-soc-dummy-dai";
|
|
|
|
codecs->name = "snd-soc-dummy";
|
|
|
|
|
|
|
|
/* FE settings */
|
|
|
|
dai_link->dynamic = 1;
|
|
|
|
dai_link->dpcm_merged_format = 1;
|
|
|
|
|
|
|
|
dai =
|
2018-12-20 09:46:53 +08:00
|
|
|
dai_props->cpu_dai = &priv->dais[li->dais++];
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_cpu(np, dai_link, &is_single_links);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_clk_cpu(dev, np, dai_link, dai);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret < 0)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_set_dailink_name(dev, dai_link,
|
|
|
|
"fe.%s",
|
2019-06-06 12:07:35 +08:00
|
|
|
cpus->dai_name);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret < 0)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
asoc_simple_canonicalize_cpu(dai_link, is_single_links);
|
2018-12-14 10:35:10 +08:00
|
|
|
} else {
|
|
|
|
struct snd_soc_codec_conf *cconf;
|
|
|
|
|
2019-10-15 10:52:41 +08:00
|
|
|
/* CPU is dummy */
|
2019-06-06 12:07:35 +08:00
|
|
|
cpus->of_node = NULL;
|
|
|
|
cpus->dai_name = "snd-soc-dummy-dai";
|
|
|
|
cpus->name = "snd-soc-dummy";
|
2018-12-14 10:35:10 +08:00
|
|
|
|
|
|
|
/* BE settings */
|
|
|
|
dai_link->no_pcm = 1;
|
2019-03-20 12:56:06 +08:00
|
|
|
dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
|
|
|
dai =
|
2018-12-20 09:46:53 +08:00
|
|
|
dai_props->codec_dai = &priv->dais[li->dais++];
|
2018-12-14 10:35:10 +08:00
|
|
|
|
|
|
|
cconf =
|
2018-12-20 09:46:53 +08:00
|
|
|
dai_props->codec_conf = &priv->codec_conf[li->conf++];
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_codec(np, dai_link);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret < 0)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_clk_codec(dev, np, dai_link, dai);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret < 0)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_set_dailink_name(dev, dai_link,
|
|
|
|
"be.%s",
|
|
|
|
codecs->dai_name);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret < 0)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
|
|
|
/* check "prefix" from top node */
|
2018-12-14 10:35:24 +08:00
|
|
|
snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,
|
2018-12-14 10:35:10 +08:00
|
|
|
PREFIX "prefix");
|
2018-12-14 10:35:24 +08:00
|
|
|
snd_soc_of_parse_node_prefix(node, cconf, codecs->of_node,
|
|
|
|
"prefix");
|
|
|
|
snd_soc_of_parse_node_prefix(np, cconf, codecs->of_node,
|
|
|
|
"prefix");
|
2018-12-14 10:35:10 +08:00
|
|
|
}
|
|
|
|
|
2019-03-18 12:50:08 +08:00
|
|
|
simple_parse_convert(dev, np, &dai_props->adata);
|
2019-03-18 12:50:17 +08:00
|
|
|
simple_parse_mclk_fs(top, np, codec, dai_props, prefix);
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
asoc_simple_canonicalize_platform(dai_link);
|
2019-01-21 15:40:59 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_tdm(np, dai);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_daifmt(dev, node, codec,
|
|
|
|
prefix, &dai_link->dai_fmt);
|
2018-12-14 10:35:10 +08:00
|
|
|
if (ret < 0)
|
2019-07-10 15:25:06 +08:00
|
|
|
goto out_put_node;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2020-07-08 05:04:37 +08:00
|
|
|
snd_soc_dai_link_set_capabilities(dai_link);
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
dai_link->ops = &simple_ops;
|
2019-03-20 12:55:52 +08:00
|
|
|
dai_link->init = asoc_simple_dai_init;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
2019-07-10 15:25:06 +08:00
|
|
|
out_put_node:
|
|
|
|
of_node_put(node);
|
|
|
|
return ret;
|
2018-12-14 10:35:10 +08:00
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static int simple_dai_link_of(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:34 +08:00
|
|
|
struct device_node *np,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct link_info *li,
|
|
|
|
bool is_top)
|
2014-03-20 18:49:55 +08:00
|
|
|
{
|
2014-09-10 12:37:57 +08:00
|
|
|
struct device *dev = simple_priv_to_dev(priv);
|
2018-12-20 09:46:53 +08:00
|
|
|
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);
|
2018-12-04 16:19:43 +08:00
|
|
|
struct asoc_simple_dai *cpu_dai;
|
|
|
|
struct asoc_simple_dai *codec_dai;
|
2018-12-20 09:47:23 +08:00
|
|
|
struct device_node *top = dev->of_node;
|
2014-10-28 09:04:52 +08:00
|
|
|
struct device_node *cpu = NULL;
|
2018-12-20 09:47:23 +08:00
|
|
|
struct device_node *node = NULL;
|
2015-04-29 18:11:07 +08:00
|
|
|
struct device_node *plat = NULL;
|
2014-03-24 18:15:25 +08:00
|
|
|
char prop[128];
|
|
|
|
char *prefix = "";
|
2016-08-08 14:02:07 +08:00
|
|
|
int ret, single_cpu;
|
2014-03-20 18:49:55 +08:00
|
|
|
|
2018-12-20 09:47:23 +08:00
|
|
|
/*
|
|
|
|
* |CPU |Codec : turn
|
|
|
|
* CPU |Pass |return
|
|
|
|
* Codec |return|return
|
|
|
|
* np
|
|
|
|
*/
|
|
|
|
if (!li->cpu || np == codec)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cpu = np;
|
|
|
|
node = of_get_parent(np);
|
2018-12-20 09:46:53 +08:00
|
|
|
li->link++;
|
|
|
|
|
|
|
|
dev_dbg(dev, "link_of (%pOF)\n", node);
|
|
|
|
|
2014-09-03 10:23:39 +08:00
|
|
|
/* For single DAI link & old style of DT node */
|
2018-12-20 09:47:23 +08:00
|
|
|
if (is_top)
|
2016-05-31 16:59:01 +08:00
|
|
|
prefix = PREFIX;
|
2014-03-24 18:15:25 +08:00
|
|
|
|
2015-04-29 18:11:07 +08:00
|
|
|
snprintf(prop, sizeof(prop), "%splat", prefix);
|
|
|
|
plat = of_get_child_by_name(node, prop);
|
|
|
|
|
2018-12-04 16:19:43 +08:00
|
|
|
cpu_dai =
|
2018-12-20 09:46:53 +08:00
|
|
|
dai_props->cpu_dai = &priv->dais[li->dais++];
|
2018-12-04 16:19:43 +08:00
|
|
|
codec_dai =
|
2018-12-20 09:46:53 +08:00
|
|
|
dai_props->codec_dai = &priv->dais[li->dais++];
|
2018-12-04 16:19:43 +08:00
|
|
|
|
ASoC: simple-card: Restore original configuration of DAI format
Revert commit 069d037aea98 ("ASoC: simple-card: Fix configuration of
DAI format"). During further review, it turns out that the actual issue
was caused by an incorrectly formatted device-tree node describing the
soundcard.
The following is incorrect because the simple-audio-card
'bitclock-master' and 'frame-master' properties should not reference the
actual codec phandle ...
sound {
compatible = "simple-audio-card";
...
=> simple-audio-card,bitclock-master = <&codec>;
=> simple-audio-card,frame-master = <&codec>;
...
simple-audio-card,cpu {
sound-dai = <&xxx>;
};
simple-audio-card,codec {
=> sound-dai = <&codec>;
};
};
Rather, these properties should reference the phandle to the
'simple-audio-card,codec' property as shown below ...
sound {
compatible = "simple-audio-card";
...
=> simple-audio-card,bitclock-master = <&codec>;
=> simple-audio-card,frame-master = <&codec>;
...
simple-audio-card,cpu {
sound-dai = <&xxx>;
};
=> codec: simple-audio-card,codec { /* simple-card wants here */
sound-dai = <&xxx>; /* not here */
};
};
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-05-24 16:54:04 +08:00
|
|
|
ret = asoc_simple_parse_daifmt(dev, node, codec,
|
|
|
|
prefix, &dai_link->dai_fmt);
|
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-18 12:50:17 +08:00
|
|
|
simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix);
|
2015-06-05 16:19:05 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu);
|
2016-08-08 14:02:07 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_codec(codec, dai_link);
|
2016-08-08 14:02:07 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_platform(plat, dai_link);
|
2016-08-08 14:02:07 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_tdm(cpu, cpu_dai);
|
2014-03-24 18:15:25 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_tdm(codec, codec_dai);
|
2016-05-20 17:40:41 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_clk_cpu(dev, cpu, dai_link, cpu_dai);
|
2016-07-19 10:53:13 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_clk_codec(dev, codec, dai_link, codec_dai);
|
2016-07-19 10:53:13 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_set_dailink_name(dev, dai_link,
|
|
|
|
"%s-%s",
|
2019-06-06 12:07:35 +08:00
|
|
|
dai_link->cpus->dai_name,
|
2019-03-20 12:56:50 +08:00
|
|
|
dai_link->codecs->dai_name);
|
2016-07-12 07:57:34 +08:00
|
|
|
if (ret < 0)
|
2015-03-03 21:29:00 +08:00
|
|
|
goto dai_link_of_err;
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
dai_link->ops = &simple_ops;
|
2019-03-20 12:55:52 +08:00
|
|
|
dai_link->init = asoc_simple_dai_init;
|
2014-03-24 18:15:25 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
asoc_simple_canonicalize_cpu(dai_link, single_cpu);
|
|
|
|
asoc_simple_canonicalize_platform(dai_link);
|
2014-08-28 11:08:06 +08:00
|
|
|
|
2014-03-24 18:15:25 +08:00
|
|
|
dai_link_of_err:
|
2019-02-19 23:46:48 +08:00
|
|
|
of_node_put(plat);
|
2018-12-20 09:47:23 +08:00
|
|
|
of_node_put(node);
|
2014-10-28 09:04:52 +08:00
|
|
|
|
2014-03-20 18:49:55 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static int simple_for_each_link(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:28 +08:00
|
|
|
struct link_info *li,
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
int (*func_noml)(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:28 +08:00
|
|
|
struct device_node *np,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct link_info *li, bool is_top),
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
int (*func_dpcm)(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:28 +08:00
|
|
|
struct device_node *np,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct link_info *li, bool is_top))
|
|
|
|
{
|
|
|
|
struct device *dev = simple_priv_to_dev(priv);
|
|
|
|
struct device_node *top = dev->of_node;
|
|
|
|
struct device_node *node;
|
2019-04-04 08:52:52 +08:00
|
|
|
uintptr_t dpcm_selectable = (uintptr_t)of_device_get_match_data(dev);
|
2018-12-20 09:47:28 +08:00
|
|
|
bool is_top = 0;
|
2019-02-19 23:46:49 +08:00
|
|
|
int ret = 0;
|
2018-12-20 09:47:28 +08:00
|
|
|
|
|
|
|
/* Check if it has dai-link */
|
|
|
|
node = of_get_child_by_name(top, PREFIX "dai-link");
|
|
|
|
if (!node) {
|
2019-02-16 18:09:42 +08:00
|
|
|
node = of_node_get(top);
|
2018-12-20 09:47:28 +08:00
|
|
|
is_top = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* loop for all dai-link */
|
|
|
|
do {
|
2019-03-20 12:56:50 +08:00
|
|
|
struct asoc_simple_data adata;
|
2018-12-20 09:47:28 +08:00
|
|
|
struct device_node *codec;
|
2019-12-09 21:53:53 +08:00
|
|
|
struct device_node *plat;
|
2018-12-20 09:47:28 +08:00
|
|
|
struct device_node *np;
|
|
|
|
int num = of_get_child_count(node);
|
|
|
|
|
|
|
|
/* get codec */
|
|
|
|
codec = of_get_child_by_name(node, is_top ?
|
|
|
|
PREFIX "codec" : "codec");
|
2019-02-19 23:46:49 +08:00
|
|
|
if (!codec) {
|
|
|
|
ret = -ENODEV;
|
|
|
|
goto error;
|
|
|
|
}
|
2019-12-09 21:53:53 +08:00
|
|
|
/* get platform */
|
|
|
|
plat = of_get_child_by_name(node, is_top ?
|
|
|
|
PREFIX "plat" : "plat");
|
2018-12-20 09:47:28 +08:00
|
|
|
|
|
|
|
/* get convert-xxx property */
|
|
|
|
memset(&adata, 0, sizeof(adata));
|
|
|
|
for_each_child_of_node(node, np)
|
2019-03-18 12:50:08 +08:00
|
|
|
simple_parse_convert(dev, np, &adata);
|
2018-12-20 09:47:28 +08:00
|
|
|
|
|
|
|
/* loop for all CPU/Codec node */
|
|
|
|
for_each_child_of_node(node, np) {
|
2019-12-09 21:53:53 +08:00
|
|
|
if (plat == np)
|
|
|
|
continue;
|
2018-12-20 09:47:28 +08:00
|
|
|
/*
|
|
|
|
* It is DPCM
|
|
|
|
* if it has many CPUs,
|
|
|
|
* or has convert-xxx property
|
|
|
|
*/
|
2019-04-04 08:52:52 +08:00
|
|
|
if (dpcm_selectable &&
|
|
|
|
(num > 2 ||
|
|
|
|
adata.convert_rate || adata.convert_channels))
|
2018-12-20 09:47:28 +08:00
|
|
|
ret = func_dpcm(priv, np, codec, li, is_top);
|
|
|
|
/* else normal sound */
|
|
|
|
else
|
|
|
|
ret = func_noml(priv, np, codec, li, is_top);
|
|
|
|
|
2019-02-19 23:46:49 +08:00
|
|
|
if (ret < 0) {
|
2019-07-10 15:25:07 +08:00
|
|
|
of_node_put(codec);
|
2019-02-19 23:46:49 +08:00
|
|
|
of_node_put(np);
|
|
|
|
goto error;
|
|
|
|
}
|
2018-12-20 09:47:28 +08:00
|
|
|
}
|
|
|
|
|
2019-07-10 15:25:07 +08:00
|
|
|
of_node_put(codec);
|
2018-12-20 09:47:28 +08:00
|
|
|
node = of_get_next_child(top, node);
|
|
|
|
} while (!is_top && node);
|
|
|
|
|
2019-02-19 23:46:49 +08:00
|
|
|
error:
|
|
|
|
of_node_put(node);
|
|
|
|
return ret;
|
2018-12-20 09:47:28 +08:00
|
|
|
}
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
static int simple_parse_aux_devs(struct device_node *node,
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
struct asoc_simple_priv *priv)
|
2016-09-26 17:56:51 +08:00
|
|
|
{
|
|
|
|
struct device *dev = simple_priv_to_dev(priv);
|
|
|
|
struct device_node *aux_node;
|
2017-03-15 12:44:00 +08:00
|
|
|
struct snd_soc_card *card = simple_priv_to_card(priv);
|
2016-09-26 17:56:51 +08:00
|
|
|
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;
|
|
|
|
|
treewide: devm_kzalloc() -> devm_kcalloc()
The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
devm_kzalloc(handle, a * b, gfp)
with:
devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
devm_kzalloc(handle, a * b * c, gfp)
with:
devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
devm_kzalloc(HANDLE,
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
devm_kzalloc(HANDLE,
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
devm_kzalloc(HANDLE,
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(char) * COUNT
+ COUNT
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
devm_kzalloc(HANDLE,
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
devm_kzalloc(HANDLE,
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE,
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
devm_kzalloc(HANDLE,
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * E2
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- (E1) * (E2)
+ E1, E2
, ...)
|
- devm_kzalloc
+ devm_kcalloc
(HANDLE,
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 05:07:58 +08:00
|
|
|
card->aux_dev = devm_kcalloc(dev,
|
|
|
|
n, sizeof(*card->aux_dev), GFP_KERNEL);
|
2017-03-15 12:44:00 +08:00
|
|
|
if (!card->aux_dev)
|
2016-09-26 17:56:51 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
aux_node = of_parse_phandle(node, PREFIX "aux-devs", i);
|
|
|
|
if (!aux_node)
|
|
|
|
return -EINVAL;
|
2019-08-08 13:52:47 +08:00
|
|
|
card->aux_dev[i].dlc.of_node = aux_node;
|
2016-09-26 17:56:51 +08:00
|
|
|
}
|
|
|
|
|
2017-03-15 12:44:00 +08:00
|
|
|
card->num_aux_devs = n;
|
2016-09-26 17:56:51 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static int simple_parse_of(struct asoc_simple_priv *priv)
|
2013-11-20 14:25:02 +08:00
|
|
|
{
|
2014-09-10 12:37:57 +08:00
|
|
|
struct device *dev = simple_priv_to_dev(priv);
|
2018-12-14 10:35:10 +08:00
|
|
|
struct device_node *top = dev->of_node;
|
2017-03-15 12:44:00 +08:00
|
|
|
struct snd_soc_card *card = simple_priv_to_card(priv);
|
2018-12-20 09:46:53 +08:00
|
|
|
struct link_info li;
|
2018-12-20 09:47:28 +08:00
|
|
|
int ret;
|
2018-12-14 10:35:10 +08:00
|
|
|
|
|
|
|
if (!top)
|
2014-09-03 10:23:39 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_widgets(card, PREFIX);
|
2017-06-16 09:39:11 +08:00
|
|
|
if (ret < 0)
|
2018-12-14 10:35:10 +08:00
|
|
|
return ret;
|
2014-02-08 15:59:53 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_routing(card, PREFIX);
|
2017-06-15 08:25:17 +08:00
|
|
|
if (ret < 0)
|
2018-12-14 10:35:10 +08:00
|
|
|
return ret;
|
2013-12-23 12:57:01 +08:00
|
|
|
|
2019-04-26 10:25:50 +08:00
|
|
|
ret = asoc_simple_parse_pin_switches(card, PREFIX);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2014-09-03 10:23:39 +08:00
|
|
|
/* Single/Muti DAI link(s) & New style of DT node */
|
2018-12-20 09:46:53 +08:00
|
|
|
memset(&li, 0, sizeof(li));
|
2018-12-20 09:47:28 +08:00
|
|
|
for (li.cpu = 1; li.cpu >= 0; li.cpu--) {
|
2018-12-20 09:47:23 +08:00
|
|
|
/*
|
|
|
|
* Detect all CPU first, and Detect all Codec 2nd.
|
|
|
|
*
|
|
|
|
* In Normal sound case, all DAIs are detected
|
|
|
|
* as "CPU-Codec".
|
|
|
|
*
|
|
|
|
* In DPCM sound case,
|
|
|
|
* all CPUs are detected as "CPU-dummy", and
|
|
|
|
* all Codecs are detected as "dummy-Codec".
|
|
|
|
* To avoid random sub-device numbering,
|
|
|
|
* detect "dummy-Codec" in last;
|
|
|
|
*/
|
2018-12-20 09:47:34 +08:00
|
|
|
ret = simple_for_each_link(priv, &li,
|
|
|
|
simple_dai_link_of,
|
|
|
|
simple_dai_link_of_dpcm);
|
2018-12-20 09:47:28 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
}
|
2018-12-20 09:47:23 +08:00
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_parse_card_name(card, PREFIX);
|
2016-09-26 17:56:51 +08:00
|
|
|
if (ret < 0)
|
2018-12-14 10:35:10 +08:00
|
|
|
return ret;
|
2014-02-28 10:25:24 +08:00
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
ret = simple_parse_aux_devs(top, priv);
|
2016-08-26 11:05:16 +08:00
|
|
|
|
|
|
|
return ret;
|
2013-11-20 14:25:02 +08:00
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static int simple_count_noml(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:34 +08:00
|
|
|
struct device_node *np,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct link_info *li, bool is_top)
|
2018-12-20 09:47:23 +08:00
|
|
|
{
|
|
|
|
li->dais++; /* CPU or Codec */
|
|
|
|
if (np != codec)
|
|
|
|
li->link++; /* CPU-Codec */
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static int simple_count_dpcm(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:34 +08:00
|
|
|
struct device_node *np,
|
|
|
|
struct device_node *codec,
|
|
|
|
struct link_info *li, bool is_top)
|
2018-12-20 09:47:23 +08:00
|
|
|
{
|
|
|
|
li->dais++; /* CPU or Codec */
|
|
|
|
li->link++; /* CPU-dummy or dummy-Codec */
|
|
|
|
if (np == codec)
|
|
|
|
li->conf++;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
static void simple_get_dais_count(struct asoc_simple_priv *priv,
|
2018-12-20 09:47:34 +08:00
|
|
|
struct link_info *li)
|
2018-12-14 10:35:10 +08:00
|
|
|
{
|
2018-12-20 09:47:23 +08:00
|
|
|
struct device *dev = simple_priv_to_dev(priv);
|
2018-12-14 10:35:10 +08:00
|
|
|
struct device_node *top = dev->of_node;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* link_num : number of links.
|
|
|
|
* CPU-Codec / CPU-dummy / dummy-Codec
|
|
|
|
* dais_num : number of DAIs
|
|
|
|
* ccnf_num : number of codec_conf
|
|
|
|
* same number for "dummy-Codec"
|
|
|
|
*
|
|
|
|
* ex1)
|
|
|
|
* CPU0 --- Codec0 link : 5
|
|
|
|
* CPU1 --- Codec1 dais : 7
|
|
|
|
* CPU2 -/ ccnf : 1
|
|
|
|
* CPU3 --- Codec2
|
|
|
|
*
|
|
|
|
* => 5 links = 2xCPU-Codec + 2xCPU-dummy + 1xdummy-Codec
|
|
|
|
* => 7 DAIs = 4xCPU + 3xCodec
|
|
|
|
* => 1 ccnf = 1xdummy-Codec
|
|
|
|
*
|
|
|
|
* ex2)
|
|
|
|
* CPU0 --- Codec0 link : 5
|
|
|
|
* CPU1 --- Codec1 dais : 6
|
|
|
|
* CPU2 -/ ccnf : 1
|
|
|
|
* CPU3 -/
|
|
|
|
*
|
|
|
|
* => 5 links = 1xCPU-Codec + 3xCPU-dummy + 1xdummy-Codec
|
|
|
|
* => 6 DAIs = 4xCPU + 2xCodec
|
|
|
|
* => 1 ccnf = 1xdummy-Codec
|
|
|
|
*
|
|
|
|
* ex3)
|
|
|
|
* CPU0 --- Codec0 link : 6
|
|
|
|
* CPU1 -/ dais : 6
|
|
|
|
* CPU2 --- Codec1 ccnf : 2
|
|
|
|
* CPU3 -/
|
|
|
|
*
|
|
|
|
* => 6 links = 0xCPU-Codec + 4xCPU-dummy + 2xdummy-Codec
|
|
|
|
* => 6 DAIs = 4xCPU + 2xCodec
|
|
|
|
* => 2 ccnf = 2xdummy-Codec
|
2018-12-20 09:46:47 +08:00
|
|
|
*
|
|
|
|
* ex4)
|
|
|
|
* CPU0 --- Codec0 (convert-rate) link : 3
|
|
|
|
* CPU1 --- Codec1 dais : 4
|
|
|
|
* ccnf : 1
|
|
|
|
*
|
|
|
|
* => 3 links = 1xCPU-Codec + 1xCPU-dummy + 1xdummy-Codec
|
|
|
|
* => 4 DAIs = 2xCPU + 2xCodec
|
|
|
|
* => 1 ccnf = 1xdummy-Codec
|
2018-12-14 10:35:10 +08:00
|
|
|
*/
|
|
|
|
if (!top) {
|
2018-12-20 09:46:53 +08:00
|
|
|
li->link = 1;
|
|
|
|
li->dais = 2;
|
|
|
|
li->conf = 0;
|
2018-12-14 10:35:10 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
simple_for_each_link(priv, li,
|
|
|
|
simple_count_noml,
|
|
|
|
simple_count_dpcm);
|
|
|
|
|
2018-12-20 09:47:28 +08:00
|
|
|
dev_dbg(dev, "link %d, dais %d, ccnf %d\n",
|
|
|
|
li->link, li->dais, li->conf);
|
2018-12-14 10:35:10 +08:00
|
|
|
}
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
static int simple_soc_probe(struct snd_soc_card *card)
|
2018-06-11 16:32:13 +08:00
|
|
|
{
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);
|
2018-06-11 16:32:13 +08:00
|
|
|
int ret;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_init_hp(card, &priv->hp_jack, PREFIX);
|
2018-06-11 16:32:13 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_init_mic(card, &priv->mic_jack, PREFIX);
|
2018-06-11 16:32:13 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-05-16 18:26:28 +08:00
|
|
|
static int asoc_simple_probe(struct platform_device *pdev)
|
2012-04-09 12:17:50 +08:00
|
|
|
{
|
ASoC: simple_card_utils: share common priv for simple-card/audio-graph
Historically, simple-card/simple-scu-card/audio-graph/audio-graph-scu
are similar but different generic sound card.
simple-scu-card which was for DPCM was merged into simple-card, and
audio-graph-scu which was for DPCM was merged into audio-graph.
simple-card is for non OF graph sound card, and
audio-graph is for OF graph sound card.
And, small detail difference (= function parameter, naming, etc)
between simple-card/audio-graph has been unified.
So today, the difference between simple-card/audio-graph are
just using OF graph style, or not.
In other words, there should no difference other than OF graph sytle.
simple-card/audio-graph are using own priv today , but we can merge it.
This patch merge it at simple_card_utils.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2019-03-20 12:54:59 +08:00
|
|
|
struct asoc_simple_priv *priv;
|
2012-12-26 14:52:33 +08:00
|
|
|
struct device *dev = &pdev->dev;
|
2017-03-15 12:43:21 +08:00
|
|
|
struct device_node *np = dev->of_node;
|
2017-03-15 12:44:00 +08:00
|
|
|
struct snd_soc_card *card;
|
2018-12-20 09:46:53 +08:00
|
|
|
struct link_info li;
|
2019-03-20 12:56:26 +08:00
|
|
|
int ret;
|
2012-04-09 12:17:50 +08:00
|
|
|
|
2014-09-10 09:59:55 +08:00
|
|
|
/* Allocate the private data and the DAI link array */
|
2016-08-26 11:10:25 +08:00
|
|
|
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
2014-01-15 23:51:52 +08:00
|
|
|
if (!priv)
|
2014-01-14 12:35:32 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2018-12-20 09:47:23 +08:00
|
|
|
card = simple_priv_to_card(priv);
|
|
|
|
card->owner = THIS_MODULE;
|
|
|
|
card->dev = dev;
|
2018-12-20 09:47:34 +08:00
|
|
|
card->probe = simple_soc_probe;
|
2018-12-20 09:47:23 +08:00
|
|
|
|
2018-12-20 09:46:53 +08:00
|
|
|
memset(&li, 0, sizeof(li));
|
2018-12-20 09:47:34 +08:00
|
|
|
simple_get_dais_count(priv, &li);
|
2018-12-20 09:46:53 +08:00
|
|
|
if (!li.link || !li.dais)
|
2018-12-14 10:35:10 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
ret = asoc_simple_init_priv(priv, &li);
|
2019-03-20 12:56:26 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2014-01-15 23:51:41 +08:00
|
|
|
|
2013-11-20 14:25:02 +08:00
|
|
|
if (np && of_device_is_available(np)) {
|
2014-01-14 12:35:32 +08:00
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
ret = simple_parse_of(priv);
|
2014-01-14 12:35:32 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
if (ret != -EPROBE_DEFER)
|
|
|
|
dev_err(dev, "parse error %d\n", ret);
|
2014-03-11 17:03:40 +08:00
|
|
|
goto err;
|
2013-11-20 14:25:02 +08:00
|
|
|
}
|
2014-03-20 18:49:55 +08:00
|
|
|
|
2013-11-20 14:25:02 +08:00
|
|
|
} else {
|
2014-01-15 23:51:52 +08:00
|
|
|
struct asoc_simple_card_info *cinfo;
|
2019-06-06 12:07:35 +08:00
|
|
|
struct snd_soc_dai_link_component *cpus;
|
2018-08-31 11:08:24 +08:00
|
|
|
struct snd_soc_dai_link_component *codecs;
|
2018-08-31 11:10:33 +08:00
|
|
|
struct snd_soc_dai_link_component *platform;
|
2019-03-20 12:56:26 +08:00
|
|
|
struct snd_soc_dai_link *dai_link = priv->dai_link;
|
|
|
|
struct simple_dai_props *dai_props = priv->dai_props;
|
|
|
|
|
2018-12-13 13:15:20 +08:00
|
|
|
int dai_idx = 0;
|
2014-01-15 23:51:52 +08:00
|
|
|
|
|
|
|
cinfo = dev->platform_data;
|
|
|
|
if (!cinfo) {
|
2014-01-09 17:49:40 +08:00
|
|
|
dev_err(dev, "no info for asoc-simple-card\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2013-11-20 14:25:02 +08:00
|
|
|
|
2014-04-24 19:14:00 +08:00
|
|
|
if (!cinfo->name ||
|
|
|
|
!cinfo->codec_dai.name ||
|
|
|
|
!cinfo->codec ||
|
|
|
|
!cinfo->platform ||
|
2014-01-15 23:51:33 +08:00
|
|
|
!cinfo->cpu_dai.name) {
|
|
|
|
dev_err(dev, "insufficient asoc_simple_card_info settings\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2014-01-15 23:51:37 +08:00
|
|
|
|
2018-12-13 13:15:20 +08:00
|
|
|
dai_props->cpu_dai = &priv->dais[dai_idx++];
|
|
|
|
dai_props->codec_dai = &priv->dais[dai_idx++];
|
|
|
|
|
2019-06-06 12:07:35 +08:00
|
|
|
cpus = dai_link->cpus;
|
|
|
|
cpus->dai_name = cinfo->cpu_dai.name;
|
|
|
|
|
2018-08-31 11:08:24 +08:00
|
|
|
codecs = dai_link->codecs;
|
|
|
|
codecs->name = cinfo->codec;
|
|
|
|
codecs->dai_name = cinfo->codec_dai.name;
|
|
|
|
|
2019-01-21 08:32:32 +08:00
|
|
|
platform = dai_link->platforms;
|
2018-08-31 11:10:33 +08:00
|
|
|
platform->name = cinfo->platform;
|
|
|
|
|
2017-03-15 12:44:00 +08:00
|
|
|
card->name = (cinfo->card) ? cinfo->card : cinfo->name;
|
2014-01-15 23:51:45 +08:00
|
|
|
dai_link->name = cinfo->name;
|
|
|
|
dai_link->stream_name = cinfo->name;
|
2015-03-24 09:07:08 +08:00
|
|
|
dai_link->dai_fmt = cinfo->daifmt;
|
2019-03-20 12:55:52 +08:00
|
|
|
dai_link->init = asoc_simple_dai_init;
|
2019-03-20 12:56:26 +08:00
|
|
|
memcpy(dai_props->cpu_dai, &cinfo->cpu_dai,
|
|
|
|
sizeof(*dai_props->cpu_dai));
|
|
|
|
memcpy(dai_props->codec_dai, &cinfo->codec_dai,
|
|
|
|
sizeof(*dai_props->codec_dai));
|
2012-04-09 12:17:50 +08:00
|
|
|
}
|
|
|
|
|
2017-03-15 12:44:00 +08:00
|
|
|
snd_soc_card_set_drvdata(card, priv);
|
2012-04-09 12:17:50 +08:00
|
|
|
|
2019-03-20 12:54:42 +08:00
|
|
|
asoc_simple_debug_info(priv);
|
|
|
|
|
2017-03-15 12:44:00 +08:00
|
|
|
ret = devm_snd_soc_register_card(dev, card);
|
2017-05-19 08:57:21 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return 0;
|
2014-03-11 17:03:40 +08:00
|
|
|
err:
|
2019-03-20 12:56:50 +08:00
|
|
|
asoc_simple_clean_reference(card);
|
2016-08-26 11:07:59 +08:00
|
|
|
|
2014-03-11 17:03:40 +08:00
|
|
|
return ret;
|
2012-04-09 12:17:50 +08:00
|
|
|
}
|
|
|
|
|
2019-05-16 18:26:28 +08:00
|
|
|
static int asoc_simple_remove(struct platform_device *pdev)
|
2014-09-01 14:46:52 +08:00
|
|
|
{
|
2014-10-02 05:25:20 +08:00
|
|
|
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
|
|
|
|
2019-03-20 12:56:50 +08:00
|
|
|
return asoc_simple_clean_reference(card);
|
2014-09-01 14:46:52 +08:00
|
|
|
}
|
|
|
|
|
2018-12-20 09:47:34 +08:00
|
|
|
static const struct of_device_id simple_of_match[] = {
|
2013-11-20 14:25:02 +08:00
|
|
|
{ .compatible = "simple-audio-card", },
|
2019-04-04 08:52:52 +08:00
|
|
|
{ .compatible = "simple-scu-audio-card",
|
|
|
|
.data = (void *)DPCM_SELECTABLE },
|
2013-11-20 14:25:02 +08:00
|
|
|
{},
|
|
|
|
};
|
2018-12-20 09:47:34 +08:00
|
|
|
MODULE_DEVICE_TABLE(of, simple_of_match);
|
2013-11-20 14:25:02 +08:00
|
|
|
|
2012-04-09 12:17:50 +08:00
|
|
|
static struct platform_driver asoc_simple_card = {
|
|
|
|
.driver = {
|
2014-04-24 19:14:00 +08:00
|
|
|
.name = "asoc-simple-card",
|
2016-05-09 18:38:10 +08:00
|
|
|
.pm = &snd_soc_pm_ops,
|
2018-12-20 09:47:34 +08:00
|
|
|
.of_match_table = simple_of_match,
|
2012-04-09 12:17:50 +08:00
|
|
|
},
|
2019-05-16 18:26:28 +08:00
|
|
|
.probe = asoc_simple_probe,
|
|
|
|
.remove = asoc_simple_remove,
|
2012-04-09 12:17:50 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
module_platform_driver(asoc_simple_card);
|
|
|
|
|
2013-08-24 01:35:17 +08:00
|
|
|
MODULE_ALIAS("platform:asoc-simple-card");
|
2016-08-26 11:07:28 +08:00
|
|
|
MODULE_LICENSE("GPL v2");
|
2012-04-09 12:17:50 +08:00
|
|
|
MODULE_DESCRIPTION("ASoC Simple Sound Card");
|
|
|
|
MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
|