Merge branch 'asoc-5.5' into asoc-next

[linux-2.6-microblaze.git] / sound / soc / codecs / rt5682.c

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index 5370e4b..b1713ff 100644 (file)
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -44,6 +44,7 @@ static const struct rt5682_platform_data i2s_default_platform_data = {
        .dmic1_data_pin = RT5682_DMIC1_DATA_GPIO2,
        .dmic1_clk_pin = RT5682_DMIC1_CLK_GPIO3,
        .jd_src = RT5682_JD1,
+       .btndet_delay = 16,
 };
 
 struct rt5682_priv {
@@ -1027,6 +1028,18 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component,
                regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2,
                        RT5682_JD1_EN_MASK | RT5682_JD1_POL_MASK,
                        RT5682_JD1_EN | RT5682_JD1_POL_NOR);
+               regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_4,
+                       0x7f7f, (rt5682->pdata.btndet_delay << 8 |
+                       rt5682->pdata.btndet_delay));
+               regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_5,
+                       0x7f7f, (rt5682->pdata.btndet_delay << 8 |
+                       rt5682->pdata.btndet_delay));
+               regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_6,
+                       0x7f7f, (rt5682->pdata.btndet_delay << 8 |
+                       rt5682->pdata.btndet_delay));
+               regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_7,
+                       0x7f7f, (rt5682->pdata.btndet_delay << 8 |
+                       rt5682->pdata.btndet_delay));
                mod_delayed_work(system_power_efficient_wq,
                           &rt5682->jack_detect_work, msecs_to_jiffies(250));
                break;
@@ -2445,6 +2458,8 @@ static int rt5682_parse_dt(struct rt5682_priv *rt5682, struct device *dev)
                &rt5682->pdata.dmic1_clk_pin);
        device_property_read_u32(dev, "realtek,jd-src",
                &rt5682->pdata.jd_src);
+       device_property_read_u32(dev, "realtek,btndet-delay",
+               &rt5682->pdata.btndet_delay);
 
        rt5682->pdata.ldo1_en = of_get_named_gpio(dev->of_node,
                "realtek,ldo1-en-gpios", 0);