ASoC: rt5640: Add function for enabling DMIC from ACPI probed machine

There is no code enabling DMIC clock in systems that don't provide platform
data for rt5640 after commit 71d97a794301 ("ASoC: rt5640: Use the platform
data for DMIC settings").

I think it's worth to keep this static DMIC clock and alternative data pin
setting during probe time. For making possible to use DMIC from ACPI probed
machine (prior ACPI 5.1 with _DSD) this patch moves DMIC configuration to
new exported rt5640_dmic_enable() that machine drivers can call.

Please note, this patch moves DMIC configuration from i2c probe to codec
probe in case platform data for rt5640 is set.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Cc: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 33 insertions, 19 deletions

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 6bc6efdec550..2fdcbb8e8a2a 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -1906,6 +1906,32 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec,
         return 0;
 }
 
+int rt5640_dmic_enable(struct snd_soc_codec *codec,
+                       bool dmic1_data_pin, bool dmic2_data_pin)
+{
+        struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
+
+        regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+                RT5640_GP2_PIN_MASK, RT5640_GP2_PIN_DMIC1_SCL);
+
+        if (dmic1_data_pin) {
+                regmap_update_bits(rt5640->regmap, RT5640_DMIC,
+                        RT5640_DMIC_1_DP_MASK, RT5640_DMIC_1_DP_GPIO3);
+                regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+                        RT5640_GP3_PIN_MASK, RT5640_GP3_PIN_DMIC1_SDA);
+        }
+
+        if (dmic2_data_pin) {
+                regmap_update_bits(rt5640->regmap, RT5640_DMIC,
+                        RT5640_DMIC_2_DP_MASK, RT5640_DMIC_2_DP_GPIO4);
+                regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+                        RT5640_GP4_PIN_MASK, RT5640_GP4_PIN_DMIC2_SDA);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt5640_dmic_enable);
+
 static int rt5640_probe(struct snd_soc_codec *codec)
 {
         struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
@@ -1945,6 +1971,10 @@ static int rt5640_probe(struct snd_soc_codec *codec)
                 return -ENODEV;
         }
 
+        if (rt5640->pdata.dmic_en)
+                rt5640_dmic_enable(codec, rt5640->pdata.dmic1_data_pin,
+                                          rt5640->pdata.dmic2_data_pin);
+
         return 0;
 }
 
@@ -2194,25 +2224,6 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
                 regmap_update_bits(rt5640->regmap, RT5640_IN3_IN4,
                                         RT5640_IN_DF2, RT5640_IN_DF2);
 
-        if (rt5640->pdata.dmic_en) {
-                regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
-                        RT5640_GP2_PIN_MASK, RT5640_GP2_PIN_DMIC1_SCL);
-
-                if (rt5640->pdata.dmic1_data_pin) {
-                        regmap_update_bits(rt5640->regmap, RT5640_DMIC,
-                                RT5640_DMIC_1_DP_MASK, RT5640_DMIC_1_DP_GPIO3);
-                        regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
-                                RT5640_GP3_PIN_MASK, RT5640_GP3_PIN_DMIC1_SDA);
-                }
-
-                if (rt5640->pdata.dmic2_data_pin) {
-                        regmap_update_bits(rt5640->regmap, RT5640_DMIC,
-                                RT5640_DMIC_2_DP_MASK, RT5640_DMIC_2_DP_GPIO4);
-                        regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
-                                RT5640_GP4_PIN_MASK, RT5640_GP4_PIN_DMIC2_SDA);
-                }
-        }
-
         rt5640->hp_mute = 1;
 
         return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640,
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 58ebe96b86da..3deb8babeabb 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -2097,4 +2097,7 @@ struct rt5640_priv {
         bool hp_mute;
 };
 
+int rt5640_dmic_enable(struct snd_soc_codec *codec,
+                       bool dmic1_data_pin, bool dmic2_data_pin);
+
 #endif