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>

1 files changed, 23 insertions, 0 deletions

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 0199ad0bbcd0..c0161ec17572 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -37,6 +37,29 @@ struct asoc_simple_jack {
         struct snd_soc_jack_gpio gpio;
 };
 
+struct asoc_simple_priv {
+        struct snd_soc_card snd_card;
+        struct simple_dai_props {
+                struct asoc_simple_dai *cpu_dai;
+                struct asoc_simple_dai *codec_dai;
+                struct snd_soc_dai_link_component codecs; /* single codec */
+                struct snd_soc_dai_link_component platforms;
+                struct asoc_simple_card_data adata;
+                struct snd_soc_codec_conf *codec_conf;
+                unsigned int mclk_fs;
+        } *dai_props;
+        struct asoc_simple_jack hp_jack;
+        struct asoc_simple_jack mic_jack;
+        struct snd_soc_dai_link *dai_link;
+        struct asoc_simple_dai *dais;
+        struct snd_soc_codec_conf *codec_conf;
+        struct gpio_desc *pa_gpio;
+};
+#define simple_priv_to_card(priv)       (&(priv)->snd_card)
+#define simple_priv_to_props(priv, i)   ((priv)->dai_props + (i))
+#define simple_priv_to_dev(priv)        (simple_priv_to_card(priv)->dev)
+#define simple_priv_to_link(priv, i)    (simple_priv_to_card(priv)->dai_link + (i))
+
 int asoc_simple_card_parse_daifmt(struct device *dev,
                                   struct device_node *node,
                                   struct device_node *codec,