CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/88pm860x-codec.c

 /*
  * 88pm860x-codec.c -- 88PM860x ALSA SoC Audio Driver
  *
  * Copyright 2010 Marvell International Ltd.
  * Author: Haojian Zhuang <haojian.zhuang@marvell.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.
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/88pm860x.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <sound/initval.h>
 #include <sound/jack.h>
+#include <trace/events/asoc.h>
 
 #include "88pm860x-codec.h"
 
 #define MAX_NAME_LEN            20
 #define REG_CACHE_SIZE          0x40
 #define REG_CACHE_BASE          0xb0
 
 /* Status Register 1 (0x01) */
 #define REG_STATUS_1            0x01
 #define MIC_STATUS              (1 << 7)
@@ skipping 103 matching lines @@
         unsigned int            pcmclk;
         unsigned int            dir;
         unsigned int            filter;
         struct snd_soc_codec    *codec;
         struct i2c_client       *i2c;
         struct pm860x_chip      *chip;
         struct pm860x_det       det;
 
         int                     irq[4];
         unsigned char           name[4][MAX_NAME_LEN];
-        unsigned char           reg_cache[REG_CACHE_SIZE];
 };
 
 /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */
 static const DECLARE_TLV_DB_SCALE(dpga_tlv, -9450, 150, 1);
 
 /* -9dB to 0db in 3dB steps */
 static const DECLARE_TLV_DB_SCALE(adc_tlv, -900, 300, 0);
 
 /* {-23, -17, -13.5, -11, -9, -6, -3, 0}dB */
 static const unsigned int mic_tlv[] = {
@@ skipping 1005 matching lines @@
         int data;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Enable Audio PLL & Audio section */
                         data = AUDIO_PLL | AUDIO_SECTION_RESET
                                 | AUDIO_SECTION_ON;
                         pm860x_reg_write(codec->control_data, REG_MISC2, data);
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
                 data = AUDIO_PLL | AUDIO_SECTION_RESET | AUDIO_SECTION_ON;
                 pm860x_set_bits(codec->control_data, REG_MISC2, data, 0);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 static struct snd_soc_dai_ops pm860x_pcm_dai_ops = {
         .digital_mute   = pm860x_digital_mute,
         .hw_params      = pm860x_pcm_hw_params,
         .set_fmt        = pm860x_pcm_set_dai_fmt,
         .set_sysclk     = pm860x_set_dai_sysclk,
 };
 
@@ skipping 57 matching lines @@
 {
         struct pm860x_priv *pm860x = data;
         int status, shrt, report = 0, mic_report = 0;
         int mask;
 
         status = pm860x_reg_read(pm860x->i2c, REG_STATUS_1);
         shrt = pm860x_reg_read(pm860x->i2c, REG_SHORTS);
         mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt
                 | pm860x->det.hp_det;
 
+#ifndef CONFIG_SND_SOC_88PM860X_MODULE
+        if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 |
+                      SHORT_LO1 | SHORT_LO2))
+                trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev));
+#endif
+
         if ((pm860x->det.hp_det & SND_JACK_HEADPHONE)
                 && (status & HEADSET_STATUS))
                 report |= SND_JACK_HEADPHONE;
 
         if ((pm860x->det.mic_det & SND_JACK_MICROPHONE)
                 && (status & MIC_STATUS))
                 mic_report |= SND_JACK_MICROPHONE;
 
         if (pm860x->det.hs_shrt && (shrt & (SHORT_HS1 | SHORT_HS2)))
                 report |= pm860x->det.hs_shrt;
@@ skipping 63 matching lines @@
 
         /* sync status */
         pm860x_codec_handler(0, pm860x);
         return 0;
 }
 EXPORT_SYMBOL_GPL(pm860x_mic_jack_detect);
 
 static int pm860x_probe(struct snd_soc_codec *codec)
 {
         struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int i, ret;
 
         pm860x->codec = codec;
 
         codec->control_data = pm860x->i2c;
 
         for (i = 0; i < 4; i++) {
                 ret = request_threaded_irq(pm860x->irq[i], NULL,
                                            pm860x_codec_handler, IRQF_ONESHOT,
                                            pm860x->name[i], pm860x);
                 if (ret < 0) {
                         dev_err(codec->dev, "Failed to request IRQ!\n");
-                        goto out_irq;
+                        goto out;
                 }
         }
 
         pm860x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         ret = pm860x_bulk_read(codec->control_data, REG_CACHE_BASE,
                                REG_CACHE_SIZE, codec->reg_cache);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to fill register cache: %d\n",
                         ret);
-                goto out_codec;
+                goto out;
         }
 
         snd_soc_add_controls(codec, pm860x_snd_controls,
                              ARRAY_SIZE(pm860x_snd_controls));
-        snd_soc_dapm_new_controls(codec, pm860x_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, pm860x_dapm_widgets,
                                   ARRAY_SIZE(pm860x_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
         return 0;
 
-out_codec:
-        i = 3;
-out_irq:
-        for (; i >= 0; i--)
+out:
+        while (--i >= 0)
                 free_irq(pm860x->irq[i], pm860x);
-        return -EINVAL;
+        return ret;
 }
 
 static int pm860x_remove(struct snd_soc_codec *codec)
 {
         struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);
         int i;
 
         for (i = 3; i >= 0; i--)
                 free_irq(pm860x->irq[i], pm860x);
         pm860x_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ skipping 79 matching lines @@
 {
         platform_driver_unregister(&pm860x_codec_driver);
 }
 module_exit(pm860x_exit);
 
 MODULE_DESCRIPTION("ASoC 88PM860x driver");
 MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:88pm860x-codec");