ASoC: simple-card: add asoc_simple_dai for initializing

Current simple-card driver calls asoc_simple_card_dai_init()
if platform had a asoc_simple_card_dai_init pointer.
And, this initialization function works only
when platform has an applicable initial value for each dai settings.
And basically, almost all sound card requires certain initialization.
This means that almost all platform has initialization settings,
and driver do nothing if it doesn't have settings.

And additionally, current simple-card supports sysclk settings but it was
only for codec.  In order to abolish deviation between cpu and codec,
and in order to simplify processing,
this patch adds asoc_simple_dai, and removed pointless
struct asoc_simple_dai_init_info which was trigger of
calling asoc_simple_card_dai_init().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index 4b62b8dc6a4f..6c74527d4926 100644
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -14,21 +14,21 @@
 
 #include <sound/soc.h>
 
-struct asoc_simple_dai_init_info {
+struct asoc_simple_dai {
+        const char *name;
         unsigned int fmt;
-        unsigned int cpu_daifmt;
-        unsigned int codec_daifmt;
         unsigned int sysclk;
 };
 
 struct asoc_simple_card_info {
         const char *name;
         const char *card;
-        const char *cpu_dai;
         const char *codec;
         const char *platform;
-        const char *codec_dai;
-        struct asoc_simple_dai_init_info *init; /* for snd_link.init */
+
+        unsigned int daifmt;
+        struct asoc_simple_dai cpu_dai;
+        struct asoc_simple_dai codec_dai;
 
         /* used in simple-card.c */
         struct snd_soc_dai_link snd_link;