Commit a5461fd6 authored by Oder Chiou's avatar Oder Chiou Committed by Mark Brown
Browse files

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: default avatarOder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1001354c

Documentation/devicetree/bindings/sound/rt5514.txt

+3 −0
Original line number Diff line number Diff line
@@ -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

include/sound/rt5514.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * 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

sound/soc/codecs/rt5514.c

+17 −0
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/rt5514.h

+2 −0
Original line number Diff line number Diff line
@@ -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;