ASoC: audio-graph-scu-card: remove audio-graph-scu-card
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 18 Dec 2018 02:50:32 +0000 (11:50 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 3 Jan 2019 16:34:17 +0000 (16:34 +0000)
It is already merged into audio-graph-card.
audio-graph-scu-card is no longer needed.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/Kconfig
sound/soc/generic/Makefile
sound/soc/generic/audio-graph-scu-card.c [deleted file]

index 92c2cf0..59190f4 100644 (file)
@@ -24,12 +24,3 @@ config SND_AUDIO_GRAPH_CARD
          This option enables generic simple sound card support
          with OF-graph DT bindings.
          It also support DPCM of multi CPU single Codec ststem.
-
-config SND_AUDIO_GRAPH_SCU_CARD
-       tristate "ASoC Audio Graph SCU sound card support"
-       depends on OF
-       select SND_SIMPLE_CARD_UTILS
-       help
-         This option enables generic simple SCU sound card support
-         with OF-graph DT bindings.
-         It supports DPCM of multi CPU single Codec ststem.
index 9dec293..9fbfdd5 100644 (file)
@@ -3,10 +3,8 @@ snd-soc-simple-card-utils-objs := simple-card-utils.o
 snd-soc-simple-card-objs       := simple-card.o
 snd-soc-simple-scu-card-objs   := simple-scu-card.o
 snd-soc-audio-graph-card-objs  := audio-graph-card.o
-snd-soc-audio-graph-scu-card-objs      := audio-graph-scu-card.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_SIMPLE_SCU_CARD)      += snd-soc-simple-scu-card.o
 obj-$(CONFIG_SND_AUDIO_GRAPH_CARD)     += snd-soc-audio-graph-card.o
-obj-$(CONFIG_SND_AUDIO_GRAPH_SCU_CARD) += snd-soc-audio-graph-scu-card.o
diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c
deleted file mode 100644 (file)
index e1b192e..0000000
+++ /dev/null
@@ -1,501 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-//
-// ASoC audio graph SCU sound card support
-//
-// Copyright (C) 2017 Renesas Solutions Corp.
-// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
-//
-// based on
-//     ${LINUX}/sound/soc/generic/simple-scu-card.c
-//     ${LINUX}/sound/soc/generic/audio-graph-card.c
-
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/gpio.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/jack.h>
-#include <sound/simple_card_utils.h>
-
-struct graph_card_data {
-       struct snd_soc_card snd_card;
-       struct graph_dai_props {
-               struct asoc_simple_dai *cpu_dai;
-               struct asoc_simple_dai *codec_dai;
-               struct snd_soc_dai_link_component codecs;
-               struct snd_soc_dai_link_component platform;
-               struct asoc_simple_card_data adata;
-               struct snd_soc_codec_conf *codec_conf;
-       } *dai_props;
-       struct snd_soc_dai_link *dai_link;
-       struct asoc_simple_dai *dais;
-       struct asoc_simple_card_data adata;
-       struct snd_soc_codec_conf *codec_conf;
-};
-
-#define graph_priv_to_card(priv) (&(priv)->snd_card)
-#define graph_priv_to_props(priv, i) ((priv)->dai_props + (i))
-#define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev)
-#define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i))
-
-#define PREFIX "audio-graph-card,"
-
-static int asoc_graph_card_startup(struct snd_pcm_substream *substream)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct graph_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
-       struct graph_dai_props *dai_props = graph_priv_to_props(priv, rtd->num);
-       int ret = 0;
-
-       ret = asoc_simple_card_clk_enable(dai_props->cpu_dai);
-       if (ret)
-               return ret;
-
-       ret = asoc_simple_card_clk_enable(dai_props->codec_dai);
-       if (ret)
-               asoc_simple_card_clk_disable(dai_props->cpu_dai);
-
-       return ret;
-}
-
-static void asoc_graph_card_shutdown(struct snd_pcm_substream *substream)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct graph_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
-       struct graph_dai_props *dai_props = graph_priv_to_props(priv, rtd->num);
-
-       asoc_simple_card_clk_disable(dai_props->cpu_dai);
-
-       asoc_simple_card_clk_disable(dai_props->codec_dai);
-}
-
-static const struct snd_soc_ops asoc_graph_card_ops = {
-       .startup = asoc_graph_card_startup,
-       .shutdown = asoc_graph_card_shutdown,
-};
-
-static int asoc_graph_card_dai_init(struct snd_soc_pcm_runtime *rtd)
-{
-       struct graph_card_data *priv =  snd_soc_card_get_drvdata(rtd->card);
-       struct graph_dai_props *dai_props = graph_priv_to_props(priv, rtd->num);
-       int ret = 0;
-
-       ret = asoc_simple_card_init_dai(rtd->codec_dai,
-                                       dai_props->codec_dai);
-       if (ret < 0)
-               return ret;
-
-       ret = asoc_simple_card_init_dai(rtd->cpu_dai,
-                                       dai_props->cpu_dai);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
-static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
-                                              struct snd_pcm_hw_params *params)
-{
-       struct graph_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
-       struct graph_dai_props *dai_props = graph_priv_to_props(priv, rtd->num);
-
-       asoc_simple_card_convert_fixup(&dai_props->adata, params);
-
-       /* overwrite by top level adata if exist */
-       asoc_simple_card_convert_fixup(&priv->adata, params);
-
-       return 0;
-}
-
-static int asoc_graph_card_dai_link_of(struct device_node *cpu_ep,
-                                      struct device_node *codec_ep,
-                                      struct graph_card_data *priv,
-                                      int *dai_idx, int link_idx,
-                                      int *conf_idx, int is_fe)
-{
-       struct device *dev = graph_priv_to_dev(priv);
-       struct snd_soc_dai_link *dai_link = graph_priv_to_link(priv, link_idx);
-       struct graph_dai_props *dai_props = graph_priv_to_props(priv, link_idx);
-       struct snd_soc_card *card = graph_priv_to_card(priv);
-       struct device_node *ep = is_fe ? cpu_ep : codec_ep;
-       struct device_node *node = of_graph_get_port_parent(ep);
-       struct asoc_simple_dai *dai;
-       int ret;
-
-       if (is_fe) {
-               struct snd_soc_dai_link_component *codecs;
-
-               /* BE is dummy */
-               codecs                  = dai_link->codecs;
-               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 =
-               dai_props->cpu_dai      = &priv->dais[(*dai_idx)++];
-
-               ret = asoc_simple_card_parse_graph_cpu(ep, dai_link);
-               if (ret)
-                       return ret;
-
-               ret = asoc_simple_card_parse_clk_cpu(dev, ep, dai_link, dai);
-               if (ret < 0)
-                       return ret;
-
-               ret = asoc_simple_card_set_dailink_name(dev, dai_link,
-                                                       "fe.%s",
-                                                       dai_link->cpu_dai_name);
-               if (ret < 0)
-                       return ret;
-
-               /* card->num_links includes Codec */
-               asoc_simple_card_canonicalize_cpu(dai_link,
-                       of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1);
-       } else {
-               struct snd_soc_codec_conf *cconf;
-
-               /* FE is dummy */
-               dai_link->cpu_of_node           = NULL;
-               dai_link->cpu_dai_name          = "snd-soc-dummy-dai";
-               dai_link->cpu_name              = "snd-soc-dummy";
-
-               /* BE settings */
-               dai_link->no_pcm                = 1;
-               dai_link->be_hw_params_fixup    = asoc_graph_card_be_hw_params_fixup;
-
-               dai =
-               dai_props->codec_dai    = &priv->dais[(*dai_idx)++];
-
-               cconf =
-               dai_props->codec_conf   = &priv->codec_conf[(*conf_idx)++];
-
-               ret = asoc_simple_card_parse_graph_codec(ep, dai_link);
-               if (ret < 0)
-                       return ret;
-
-               ret = asoc_simple_card_parse_clk_codec(dev, ep, dai_link, dai);
-               if (ret < 0)
-                       return ret;
-
-               ret = asoc_simple_card_set_dailink_name(dev, dai_link,
-                                                       "be.%s",
-                                                       dai_link->codecs->dai_name);
-               if (ret < 0)
-                       return ret;
-
-               /* check "prefix" from top node */
-               snd_soc_of_parse_audio_prefix(card, cconf,
-                                             dai_link->codecs->of_node,
-                                             "prefix");
-               /* check "prefix" from each node if top doesn't have */
-               if (!cconf->of_node)
-                       snd_soc_of_parse_node_prefix(node, cconf,
-                                                    dai_link->codecs->of_node,
-                                                    PREFIX "prefix");
-       }
-
-       asoc_simple_card_parse_convert(dev, node, PREFIX, &dai_props->adata);
-
-       ret = asoc_simple_card_of_parse_tdm(ep, dai);
-       if (ret)
-               return ret;
-
-       ret = asoc_simple_card_canonicalize_dailink(dai_link);
-       if (ret < 0)
-               return ret;
-
-       ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep,
-                                           NULL, &dai_link->dai_fmt);
-       if (ret < 0)
-               return ret;
-
-       dai_link->dpcm_playback         = 1;
-       dai_link->dpcm_capture          = 1;
-       dai_link->ops                   = &asoc_graph_card_ops;
-       dai_link->init                  = asoc_graph_card_dai_init;
-
-       return 0;
-}
-
-static int asoc_graph_card_parse_of(struct graph_card_data *priv)
-{
-       struct of_phandle_iterator it;
-       struct device *dev = graph_priv_to_dev(priv);
-       struct snd_soc_card *card = graph_priv_to_card(priv);
-       struct device_node *node = dev->of_node;
-       struct device_node *cpu_port;
-       struct device_node *cpu_ep;
-       struct device_node *codec_ep;
-       struct device_node *codec_port;
-       struct device_node *codec_port_old;
-       int dai_idx, link_idx, conf_idx, ret;
-       int rc, codec;
-
-       if (!node)
-               return -EINVAL;
-
-       /*
-        * we need to consider "widgets", "mclk-fs" around here
-        * see simple-card
-        */
-
-       ret = asoc_simple_card_of_parse_routing(card, NULL);
-       if (ret < 0)
-               return ret;
-
-       asoc_simple_card_parse_convert(dev, node, NULL, &priv->adata);
-
-       /*
-        * it supports multi CPU, single CODEC only here
-        * see asoc_graph_get_dais_count
-        */
-
-       link_idx = 0;
-       dai_idx = 0;
-       conf_idx = 0;
-       codec_port_old = NULL;
-       for (codec = 0; codec < 2; codec++) {
-               /*
-                * To listup valid sounds continuously,
-                * detect all CPU-dummy first, and
-                * detect all dummy-Codec second
-                */
-               of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
-                       cpu_port = it.node;
-                       cpu_ep   = of_get_next_child(cpu_port, NULL);
-                       codec_ep = of_graph_get_remote_endpoint(cpu_ep);
-                       codec_port = of_graph_get_port_parent(codec_ep);
-
-                       of_node_put(cpu_ep);
-                       of_node_put(codec_ep);
-                       of_node_put(cpu_port);
-                       of_node_put(codec_port);
-                       it.node = NULL;
-
-                       if (codec) {
-                               if (codec_port_old == codec_port)
-                                       continue;
-
-                               codec_port_old = codec_port;
-                       }
-
-                       ret = asoc_graph_card_dai_link_of(cpu_ep, codec_ep,
-                                                         priv, &dai_idx,
-                                                         link_idx++, &conf_idx,
-                                                         !codec);
-                       if (ret < 0)
-                               goto parse_of_err;
-               }
-       }
-
-       ret = asoc_simple_card_parse_card_name(card, NULL);
-       if (ret)
-               goto parse_of_err;
-
-       if ((card->num_links   != link_idx) ||
-           (card->num_configs != conf_idx)) {
-               dev_err(dev, "dai_link or codec_config wrong (%d/%d, %d/%d)\n",
-                       card->num_links, link_idx, card->num_configs, conf_idx);
-               ret = -EINVAL;
-               goto parse_of_err;
-       }
-
-       ret = 0;
-
-parse_of_err:
-       return ret;
-}
-
-static void asoc_graph_get_dais_count(struct device *dev,
-                                     int *link_num,
-                                     int *dais_num,
-                                     int *ccnf_num)
-{
-       struct of_phandle_iterator it;
-       struct device_node *node = dev->of_node;
-       struct device_node *cpu_port;
-       struct device_node *cpu_ep;
-       struct device_node *codec_ep;
-       struct device_node *codec_port;
-       struct device_node *codec_port_old;
-       struct device_node *codec_port_old2;
-       int rc;
-
-       /*
-        * 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
-        */
-       codec_port_old = NULL;
-       codec_port_old2 = NULL;
-       of_for_each_phandle(&it, rc, node, "dais", NULL, 0) {
-               cpu_port = it.node;
-               cpu_ep   = of_get_next_child(cpu_port, NULL);
-               codec_ep = of_graph_get_remote_endpoint(cpu_ep);
-               codec_port = of_graph_get_port_parent(codec_ep);
-
-               of_node_put(cpu_ep);
-               of_node_put(codec_ep);
-               of_node_put(codec_port);
-
-               (*link_num)++;
-               (*dais_num)++;
-
-               if (codec_port_old == codec_port) {
-                       if (codec_port_old2 != codec_port_old) {
-                               (*link_num)++;
-                               (*ccnf_num)++;
-                       }
-
-                       codec_port_old2 = codec_port_old;
-                       continue;
-               }
-
-               (*dais_num)++;
-               codec_port_old = codec_port;
-       }
-}
-
-static int asoc_graph_card_probe(struct platform_device *pdev)
-{
-       struct graph_card_data *priv;
-       struct snd_soc_dai_link *dai_link;
-       struct graph_dai_props *dai_props;
-       struct asoc_simple_dai *dais;
-       struct device *dev = &pdev->dev;
-       struct snd_soc_card *card;
-       struct snd_soc_codec_conf *cconf;
-       int lnum = 0, dnum = 0, cnum = 0;
-       int ret, i;
-
-       /* Allocate the private data and the DAI link array */
-       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
-
-       asoc_graph_get_dais_count(dev, &lnum, &dnum, &cnum);
-       if (!lnum || !dnum)
-               return -EINVAL;
-
-       dai_props = devm_kcalloc(dev, lnum, sizeof(*dai_props), GFP_KERNEL);
-       dai_link  = devm_kcalloc(dev, lnum, sizeof(*dai_link),  GFP_KERNEL);
-       dais      = devm_kcalloc(dev, dnum, sizeof(*dais),      GFP_KERNEL);
-       cconf     = devm_kcalloc(dev, cnum, sizeof(*cconf),     GFP_KERNEL);
-       if (!dai_props || !dai_link || !dais)
-               return -ENOMEM;
-
-       /*
-        * Use snd_soc_dai_link_component instead of legacy style
-        * It is codec only. but cpu/platform will be supported in the future.
-        * see
-        *      soc-core.c :: snd_soc_init_multicodec()
-        */
-       for (i = 0; i < lnum; i++) {
-               dai_link[i].codecs      = &dai_props[i].codecs;
-               dai_link[i].num_codecs  = 1;
-               dai_link[i].platform    = &dai_props[i].platform;
-       }
-
-       priv->dai_props                 = dai_props;
-       priv->dai_link                  = dai_link;
-       priv->dais                      = dais;
-       priv->codec_conf                = cconf;
-
-       /* Init snd_soc_card */
-       card = graph_priv_to_card(priv);
-       card->owner             = THIS_MODULE;
-       card->dev               = dev;
-       card->dai_link          = priv->dai_link;
-       card->num_links         = lnum;
-       card->codec_conf        = cconf;
-       card->num_configs       = cnum;
-
-       ret = asoc_graph_card_parse_of(priv);
-       if (ret < 0) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "parse error %d\n", ret);
-               goto err;
-       }
-
-       snd_soc_card_set_drvdata(card, priv);
-
-       ret = devm_snd_soc_register_card(dev, card);
-       if (ret < 0)
-               goto err;
-
-       return 0;
-err:
-       asoc_simple_card_clean_reference(card);
-
-       return ret;
-}
-
-static int asoc_graph_card_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       return asoc_simple_card_clean_reference(card);
-}
-
-static const struct of_device_id asoc_graph_of_match[] = {
-       { .compatible = "audio-graph-scu-card", },
-       {},
-};
-MODULE_DEVICE_TABLE(of, asoc_graph_of_match);
-
-static struct platform_driver asoc_graph_card = {
-       .driver = {
-               .name = "asoc-audio-graph-scu-card",
-               .pm = &snd_soc_pm_ops,
-               .of_match_table = asoc_graph_of_match,
-       },
-       .probe = asoc_graph_card_probe,
-       .remove = asoc_graph_card_remove,
-};
-module_platform_driver(asoc_graph_card);
-
-MODULE_ALIAS("platform:asoc-audio-graph-scu-card");
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("ASoC Audio Graph SCU Sound Card");
-MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");