ASoC: rt5514: Add the DMIC initial delay to wait it ready.

Due to the DMIC that needs time to initial after the MCLK is provided, the
field of delay time is implemented by the platform data.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt
index 9cabfc18cb57be3dfbeca45a828d185b7e80f52c..929ca6756b02314ca44c9e8786ab32637a3d2294 100644 (file)
--- a/Documentation/devicetree/bindings/sound/rt5514.txt
+++ b/Documentation/devicetree/bindings/sound/rt5514.txt
@@ -13,6 +13,9 @@ Optional properties:
 - clocks: The phandle of the master clock to the CODEC
 - clock-names: Should be "mclk"
 
+- realtek,dmic-init-delay-ms
+  Set the DMIC initial delay (ms) to wait it ready.
+
 Pins on the device (for linking into audio routes) for RT5514:
 
   * DMIC1L

diff --git a/include/sound/rt5514.h b/include/sound/rt5514.h
new file mode 100644 (file)
index 0000000..ef18494
--- /dev/null
+++ b/include/sound/rt5514.h
@@ -0,0 +1,20 @@
+/*
+ * linux/sound/rt5514.h -- Platform data for RT5514
+ *
+ * Copyright 2016 Realtek Semiconductor Corp.
+ * Author: Oder Chiou <oder_chiou@realtek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_SND_RT5514_H
+#define __LINUX_SND_RT5514_H
+
+struct rt5514_platform_data {
+       unsigned int dmic_init_delay;
+};
+
+#endif
+

diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index f24b7cfd3a89fabab6f3c92d2907931a00e028b7..b281a46d769dc25165a7bb6073ec72d4a302fafd 100644 (file)
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -452,6 +452,9 @@ static int rt5514_set_dmic_clk(struct snd_soc_dapm_widget *w,
                        RT5514_CLK_DMIC_OUT_SEL_MASK,
                        idx << RT5514_CLK_DMIC_OUT_SEL_SFT);
 
+       if (rt5514->pdata.dmic_init_delay)
+               msleep(rt5514->pdata.dmic_init_delay);
+
        return idx;
 }
 
@@ -1073,9 +1076,18 @@ static const struct of_device_id rt5514_of_match[] = {
 MODULE_DEVICE_TABLE(of, rt5514_of_match);
 #endif
 
+static int rt5514_parse_dt(struct rt5514_priv *rt5514, struct device *dev)
+{
+       device_property_read_u32(dev, "realtek,dmic-init-delay-ms",
+               &rt5514->pdata.dmic_init_delay);
+
+       return 0;
+}
+
 static int rt5514_i2c_probe(struct i2c_client *i2c,
                    const struct i2c_device_id *id)
 {
+       struct rt5514_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt5514_priv *rt5514;
        int ret;
        unsigned int val;
@@ -1087,6 +1099,11 @@ static int rt5514_i2c_probe(struct i2c_client *i2c,
 
        i2c_set_clientdata(i2c, rt5514);
 
+       if (pdata)
+               rt5514->pdata = *pdata;
+       else if (i2c->dev.of_node)
+               rt5514_parse_dt(rt5514, &i2c->dev);
+
        rt5514->i2c_regmap = devm_regmap_init_i2c(i2c, &rt5514_i2c_regmap);
        if (IS_ERR(rt5514->i2c_regmap)) {
                ret = PTR_ERR(rt5514->i2c_regmap);

diff --git a/sound/soc/codecs/rt5514.h b/sound/soc/codecs/rt5514.h
index 229de0e2c88c614695b5bab80d18e7b5ac1dbd62..5d343fb6d125d46e8fe463f1b1f7485428911c92 100644 (file)
--- a/sound/soc/codecs/rt5514.h
+++ b/sound/soc/codecs/rt5514.h
@@ -13,6 +13,7 @@
 #define __RT5514_H__
 
 #include <linux/clk.h>
+#include <sound/rt5514.h>
 
 #define RT5514_DEVICE_ID                       0x10ec5514
 
@@ -243,6 +244,7 @@ enum {
 };
 
 struct rt5514_priv {
+       struct rt5514_platform_data pdata;
        struct snd_soc_codec *codec;
        struct regmap *i2c_regmap, *regmap;
        struct clk *mclk;