From: Akshu Agrawal akshu.agrawal@amd.com
Minimum time required between power On of codec and read of RT5645_VENDOR_ID2 is 400msec. We should wait and attempt before erroring out.
BUG=b:66978383 TEST=Cold boot the device and check for sound device.
Signed-off-by: Akshu Agrawal akshu.agrawal@amd.com Signed-off-by: Bard Liao bardliao@realtek.com Signed-off-by: Alex Deucher alexander.deucher@amd.com --- sound/soc/codecs/rt5645.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 23cc2cb..2da0b33 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -55,6 +55,8 @@ MODULE_PARM_DESC(quirk, "RT5645 pdata quirk override");
#define RT5645_HWEQ_NUM 57
+#define TIME_TO_POWER_MS 400 + static const struct regmap_range_cfg rt5645_ranges[] = { { .name = "PR", @@ -3712,6 +3714,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, int ret, i; unsigned int val; struct regmap *regmap; + int timeout = TIME_TO_POWER_MS;
rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv), GFP_KERNEL); @@ -3786,6 +3789,15 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, } regmap_read(regmap, RT5645_VENDOR_ID2, &val);
+ /* + * Read for 400msec, as it is the interval required between + * read and power On. + */ + while (val != RT5645_DEVICE_ID && val != RT5650_DEVICE_ID && --timeout) { + msleep(1); + regmap_read(regmap, RT5645_VENDOR_ID2, &val); + } + switch (val) { case RT5645_DEVICE_ID: rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap);