ASoC: rt5645: Use devm_gpiod_get_optional for hp-detect

[linux-2.6-block.git] / sound / soc / codecs / rt5645.c

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index d5f0f5680d3b1441a84c43acdba2d336d5520df2..43440436fd7b6fac0b34be2e2decc57720567b04 100644 (file)
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -349,6 +349,7 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg)
        case RT5645_TDM_CTRL_1:
        case RT5645_TDM_CTRL_2:
        case RT5645_TDM_CTRL_3:
+       case RT5650_TDM_CTRL_4:
        case RT5645_GLB_CLK:
        case RT5645_PLL_CTRL1:
        case RT5645_PLL_CTRL2:
@@ -2761,6 +2762,7 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
 
        if (enable) {
+               snd_soc_dapm_mutex_lock(&codec->dapm);
                snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm,
                                                        "ADC L power");
                snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm,
@@ -2770,6 +2772,8 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
                snd_soc_dapm_force_enable_pin_unlocked(&codec->dapm,
                                                        "Mic Det Power");
                snd_soc_dapm_sync_unlocked(&codec->dapm);
+               snd_soc_dapm_mutex_unlock(&codec->dapm);
+
                snd_soc_update_bits(codec,
                                        RT5645_INT_IRQ_ST, 0x8, 0x8);
                snd_soc_update_bits(codec,
@@ -2780,6 +2784,8 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
        } else {
                snd_soc_update_bits(codec, RT5650_4BTN_IL_CMD2, 0x8000, 0x0);
                snd_soc_update_bits(codec, RT5645_INT_IRQ_ST, 0x8, 0x0);
+
+               snd_soc_dapm_mutex_lock(&codec->dapm);
                snd_soc_dapm_disable_pin_unlocked(&codec->dapm,
                                                        "ADC L power");
                snd_soc_dapm_disable_pin_unlocked(&codec->dapm,
@@ -2790,6 +2796,7 @@ static void rt5645_enable_push_button_irq(struct snd_soc_codec *codec,
                snd_soc_dapm_disable_pin_unlocked(&codec->dapm,
                                                        "Mic Det Power");
                snd_soc_dapm_sync_unlocked(&codec->dapm);
+               snd_soc_dapm_mutex_unlock(&codec->dapm);
        }
 }
 
@@ -2937,17 +2944,11 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645)
 
        switch (rt5645->pdata.jd_mode) {
        case 0: /* Not using rt5645 JD */
-               if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) {
-                       gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio);
-                       dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n",
-                               rt5645->pdata.hp_det_gpio, gpio_state);
-               }
-               if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) ||
-                       (!rt5645->pdata.gpio_hp_det_active_high &&
-                        !gpio_state)) {
-                       report = rt5645_jack_detect(rt5645->codec, 1);
-               } else {
-                       report = rt5645_jack_detect(rt5645->codec, 0);
+               if (rt5645->gpiod_hp_det) {
+                       gpio_state = gpiod_get_value(rt5645->gpiod_hp_det);
+                       dev_dbg(rt5645->codec->dev, "gpio_state = %d\n",
+                               gpio_state);
+                       report = rt5645_jack_detect(rt5645->codec, gpio_state);
                }
                snd_soc_jack_report(rt5645->hp_jack,
                                    report, SND_JACK_HEADPHONE);
@@ -3230,6 +3231,20 @@ static struct dmi_system_id dmi_platform_intel_braswell[] = {
        { }
 };
 
+static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev)
+{
+       rt5645->pdata.in2_diff = device_property_read_bool(dev,
+               "realtek,in2-differential");
+       device_property_read_u32(dev,
+               "realtek,dmic1-data-pin", &rt5645->pdata.dmic1_data_pin);
+       device_property_read_u32(dev,
+               "realtek,dmic2-data-pin", &rt5645->pdata.dmic2_data_pin);
+       device_property_read_u32(dev,
+               "realtek,jd-mode", &rt5645->pdata.jd_mode);
+
+       return 0;
+}
+
 static int rt5645_i2c_probe(struct i2c_client *i2c,
                    const struct i2c_device_id *id)
 {
@@ -3237,7 +3252,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
        struct rt5645_priv *rt5645;
        int ret;
        unsigned int val;
-       struct gpio_desc *gpiod;
 
        rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv),
                                GFP_KERNEL);
@@ -3247,22 +3261,19 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
        rt5645->i2c = i2c;
        i2c_set_clientdata(i2c, rt5645);
 
-       if (pdata) {
+       if (pdata)
                rt5645->pdata = *pdata;
-       } else {
-               if (dmi_check_system(dmi_platform_intel_braswell)) {
-                       rt5645->pdata = *rt5645_pdata;
-                       gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0);
+       else if (dmi_check_system(dmi_platform_intel_braswell))
+               rt5645->pdata = *rt5645_pdata;
+       else
+               rt5645_parse_dt(rt5645, &i2c->dev);
 
-                       if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) {
-                               rt5645->pdata.hp_det_gpio = -1;
-                               dev_err(&i2c->dev, "failed to initialize gpiod\n");
-                       } else {
-                               rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod);
-                               rt5645->pdata.gpio_hp_det_active_high
-                                               = !gpiod_is_active_low(gpiod);
-                       }
-               }
+       rt5645->gpiod_hp_det = devm_gpiod_get_optional(&i2c->dev, "hp-detect",
+                                                      GPIOD_IN);
+
+       if (IS_ERR(rt5645->gpiod_hp_det)) {
+               dev_err(&i2c->dev, "failed to initialize gpiod\n");
+               return PTR_ERR(rt5645->gpiod_hp_det);
        }
 
        rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap);
@@ -3426,16 +3437,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
                        dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
        }
 
-       if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) {
-               ret = gpio_request(rt5645->pdata.hp_det_gpio, "rt5645");
-               if (ret)
-                       dev_err(&i2c->dev, "Fail gpio_request hp_det_gpio\n");
-
-               ret = gpio_direction_input(rt5645->pdata.hp_det_gpio);
-               if (ret)
-                       dev_err(&i2c->dev, "Fail gpio_direction hp_det_gpio\n");
-       }
-
        return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645,
                                      rt5645_dai, ARRAY_SIZE(rt5645_dai));
 }
@@ -3449,9 +3450,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c)
 
        cancel_delayed_work_sync(&rt5645->jack_detect_work);
 
-       if (gpio_is_valid(rt5645->pdata.hp_det_gpio))
-               gpio_free(rt5645->pdata.hp_det_gpio);
-
        snd_soc_unregister_codec(&i2c->dev);
 
        return 0;