ASoC: wm8962: Replace direct snd_soc_codec dapm field access

[deliverable/linux.git] / sound / soc / codecs / rt286.c

diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 9b541e52da8c77da4134fdf8e0c551d35a2a402b..c6cca0639e0da4888ba13464212a15e1e388bddf 100644 (file)
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -301,6 +301,7 @@ static int rt286_support_power_controls[] = {
 
 static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)
 {
+       struct snd_soc_dapm_context *dapm;
        unsigned int val, buf;
 
        *hp = false;
@@ -308,6 +309,9 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)
 
        if (!rt286->codec)
                return -EINVAL;
+
+       dapm = snd_soc_codec_get_dapm(rt286->codec);
+
        if (rt286->pdata.cbj_en) {
                regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);
                *hp = buf & 0x80000000;
@@ -316,14 +320,11 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)
                        regmap_update_bits(rt286->regmap,
                                RT286_DC_GAIN, 0x200, 0x200);
 
-                       snd_soc_dapm_force_enable_pin(&rt286->codec->dapm,
-                                                       "HV");
-                       snd_soc_dapm_force_enable_pin(&rt286->codec->dapm,
-                                                       "VREF");
+                       snd_soc_dapm_force_enable_pin(dapm, "HV");
+                       snd_soc_dapm_force_enable_pin(dapm, "VREF");
                        /* power LDO1 */
-                       snd_soc_dapm_force_enable_pin(&rt286->codec->dapm,
-                                                       "LDO1");
-                       snd_soc_dapm_sync(&rt286->codec->dapm);
+                       snd_soc_dapm_force_enable_pin(dapm, "LDO1");
+                       snd_soc_dapm_sync(dapm);
 
                        regmap_write(rt286->regmap, RT286_SET_MIC1, 0x24);
                        msleep(50);
@@ -360,11 +361,11 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)
                *mic = buf & 0x80000000;
        }
 
-       snd_soc_dapm_disable_pin(&rt286->codec->dapm, "HV");
-       snd_soc_dapm_disable_pin(&rt286->codec->dapm, "VREF");
+       snd_soc_dapm_disable_pin(dapm, "HV");
+       snd_soc_dapm_disable_pin(dapm, "VREF");
        if (!*hp)
-               snd_soc_dapm_disable_pin(&rt286->codec->dapm, "LDO1");
-       snd_soc_dapm_sync(&rt286->codec->dapm);
+               snd_soc_dapm_disable_pin(dapm, "LDO1");
+       snd_soc_dapm_sync(dapm);
 
        return 0;
 }
@@ -391,13 +392,25 @@ static void rt286_jack_detect_work(struct work_struct *work)
 
 int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);
 
        rt286->jack = jack;
 
-       /* Send an initial empty report */
-       snd_soc_jack_report(rt286->jack, 0,
-               SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
+       if (jack) {
+               /* enable IRQ */
+               if (rt286->jack->status & SND_JACK_HEADPHONE)
+                       snd_soc_dapm_force_enable_pin(dapm, "LDO1");
+               regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2);
+               /* Send an initial empty report */
+               snd_soc_jack_report(rt286->jack, rt286->jack->status,
+                       SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
+       } else {
+               /* disable IRQ */
+               regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x0);
+               snd_soc_dapm_disable_pin(dapm, "LDO1");
+       }
+       snd_soc_dapm_sync(dapm);
 
        return 0;
 }
@@ -974,7 +987,7 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,
 {
        switch (level) {
        case SND_SOC_BIAS_PREPARE:
-               if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) {
+               if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) {
                        snd_soc_write(codec,
                                RT286_SET_AUDIO_POWER, AC_PWRST_D0);
                        snd_soc_update_bits(codec,
@@ -1001,7 +1014,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec,
        default:
                break;
        }
-       codec->dapm.bias_level = level;
 
        return 0;
 }
@@ -1037,7 +1049,6 @@ static int rt286_probe(struct snd_soc_codec *codec)
        struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);
 
        rt286->codec = codec;
-       codec->dapm.bias_level = SND_SOC_BIAS_OFF;
 
        if (rt286->i2c->irq) {
                regmap_update_bits(rt286->regmap,
@@ -1209,7 +1220,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
 {
        struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev);
        struct rt286_priv *rt286;
-       int i, ret;
+       int i, ret, val;
 
        rt286 = devm_kzalloc(&i2c->dev, sizeof(*rt286),
                                GFP_KERNEL);
@@ -1224,11 +1235,15 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
                return ret;
        }
 
-       regmap_read(rt286->regmap,
-               RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &ret);
-       if (ret != RT286_VENDOR_ID && ret != RT288_VENDOR_ID) {
+       ret = regmap_read(rt286->regmap,
+               RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &val);
+       if (ret != 0) {
+               dev_err(&i2c->dev, "I2C error %d\n", ret);
+               return ret;
+       }
+       if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) {
                dev_err(&i2c->dev,
-                       "Device with ID register %x is not rt286\n", ret);
+                       "Device with ID register %x is not rt286\n", val);
                return -ENODEV;
        }
 
@@ -1236,6 +1251,14 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
        rt286->i2c = i2c;
        i2c_set_clientdata(i2c, rt286);
 
+       /* restore codec default */
+       for (i = 0; i < INDEX_CACHE_SIZE; i++)
+               regmap_write(rt286->regmap, rt286->index_cache[i].reg,
+                               rt286->index_cache[i].def);
+       for (i = 0; i < ARRAY_SIZE(rt286_reg); i++)
+               regmap_write(rt286->regmap, rt286_reg[i].reg,
+                               rt286_reg[i].def);
+
        if (pdata)
                rt286->pdata = *pdata;