ASoC: core - Allow components to probe/remove in sequence.

Some ASoC components depend on other ASoC components to provide clocks and
power resources in order to probe() and vice versa for remove().

Allow components to be ordered so that components can be probed() and removed()
in sequences that conform to their dependencies.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2 files changed, 22 insertions, 0 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 1bafe95dcf41..5ad5f3a50c68 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -209,6 +209,10 @@ struct snd_soc_dai_driver {
         struct snd_soc_pcm_stream capture;
         struct snd_soc_pcm_stream playback;
         unsigned int symmetric_rates:1;
+
+        /* probe ordering - for components with runtime dependencies */
+        int probe_order;
+        int remove_order;
 };
 
 /*
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 74093be65709..d5db87e82c6d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -203,6 +203,16 @@
         SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)
 
 /*
+ * Component probe and remove ordering levels for components with runtime
+ * dependencies.
+ */
+#define SND_SOC_COMP_ORDER_FIRST                -2
+#define SND_SOC_COMP_ORDER_EARLY                -1
+#define SND_SOC_COMP_ORDER_NORMAL               0
+#define SND_SOC_COMP_ORDER_LATE         1
+#define SND_SOC_COMP_ORDER_LAST         2
+
+/*
  * Bias levels
  *
  * @ON:      Bias is fully on for audio playback and capture operations.
@@ -613,6 +623,10 @@ struct snd_soc_codec_driver {
 
         void (*seq_notifier)(struct snd_soc_dapm_context *,
                              enum snd_soc_dapm_type, int);
+
+        /* probe ordering - for components with runtime dependencies */
+        int probe_order;
+        int remove_order;
 };
 
 /* SoC platform interface */
@@ -636,6 +650,10 @@ struct snd_soc_platform_driver {
 
         /* platform stream ops */
         struct snd_pcm_ops *ops;
+
+        /* probe ordering - for components with runtime dependencies */
+        int probe_order;
+        int remove_order;
 };
 
 struct snd_soc_platform {