CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8731.c

 /*
  * wm8731.c  --  WM8731 ALSA SoC Audio driver
  *
  * Copyright 2005 Openedhand Ltd.
  *
  * Author: Richard Purdie <richard@openedhand.com>
  *
  * Based on wm8753.c by Liam Girdwood
  *
  * 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/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.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/initval.h>
 #include <sound/tlv.h>
 
 #include "wm8731.h"
 
 #define WM8731_NUM_SUPPLIES 4
 static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
         "AVDD",
         "HPVDD",
         "DCVDD",
         "DBVDD",
 };
 
 /* codec private data */
 struct wm8731_priv {
         enum snd_soc_control_type control_type;
         struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
-        u16 reg_cache[WM8731_CACHEREGNUM];
         unsigned int sysclk;
         int sysclk_type;
+        int playback_fs;
+        bool deemph;
 };
 
 
 /*
  * wm8731 register cache
  * We can't read the WM8731 register space when we are
  * using 2 wire for device control, so we cache them instead.
  * There is no point in caching the reset register
  */
 static const u16 wm8731_reg[WM8731_CACHEREGNUM] = {
         0x0097, 0x0097, 0x0079, 0x0079,
         0x000a, 0x0008, 0x009f, 0x000a,
         0x0000, 0x0000
 };
 
 #define wm8731_reset(c) snd_soc_write(c, WM8731_RESET, 0)
 
 static const char *wm8731_input_select[] = {"Line In", "Mic"};
-static const char *wm8731_deemph[] = {"None", "32Khz", "44.1Khz", "48Khz"};
 
-static const struct soc_enum wm8731_enum[] = {
-        SOC_ENUM_SINGLE(WM8731_APANA, 2, 2, wm8731_input_select),
-        SOC_ENUM_SINGLE(WM8731_APDIGI, 1, 4, wm8731_deemph),
-};
+static const struct soc_enum wm8731_insel_enum =
+        SOC_ENUM_SINGLE(WM8731_APANA, 2, 2, wm8731_input_select);
+
+static int wm8731_deemph[] = { 0, 32000, 44100, 48000 };
+
+static int wm8731_set_deemph(struct snd_soc_codec *codec)
+{
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+        int val, i, best;
+
+        /* If we're using deemphasis select the nearest available sample
+         * rate.
+         */
+        if (wm8731->deemph) {
+                best = 1;
+                for (i = 2; i < ARRAY_SIZE(wm8731_deemph); i++) {
+                        if (abs(wm8731_deemph[i] - wm8731->playback_fs) <
+                            abs(wm8731_deemph[best] - wm8731->playback_fs))
+                                best = i;
+                }
+
+                val = best << 1;
+        } else {
+                best = 0;
+                val = 0;
+        }
+
+        dev_dbg(codec->dev, "Set deemphasis %d (%dHz)\n",
+                best, wm8731_deemph[best]);
+
+        return snd_soc_update_bits(codec, WM8731_APDIGI, 0x6, val);
+}
+
+static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+
+        ucontrol->value.enumerated.item[0] = wm8731->deemph;
+
+        return 0;
+}
+
+static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
+        int deemph = ucontrol->value.enumerated.item[0];
+        int ret = 0;
+
+        if (deemph > 1)
+                return -EINVAL;
+
+        mutex_lock(&codec->mutex);
+        if (wm8731->deemph != deemph) {
+                wm8731->deemph = deemph;
+
+                wm8731_set_deemph(codec);
+
+                ret = 1;
+        }
+        mutex_unlock(&codec->mutex);
+
+        return ret;
+}
 
 static const DECLARE_TLV_DB_SCALE(in_tlv, -3450, 150, 0);
 static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -1500, 300, 0);
 static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
+static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 2000, 0);
 
 static const struct snd_kcontrol_new wm8731_snd_controls[] = {
 
 SOC_DOUBLE_R_TLV("Master Playback Volume", WM8731_LOUT1V, WM8731_ROUT1V,
                  0, 127, 0, out_tlv),
 SOC_DOUBLE_R("Master Playback ZC Switch", WM8731_LOUT1V, WM8731_ROUT1V,
         7, 1, 0),
 
 SOC_DOUBLE_R_TLV("Capture Volume", WM8731_LINVOL, WM8731_RINVOL, 0, 31, 0,
                  in_tlv),
 SOC_DOUBLE_R("Line Capture Switch", WM8731_LINVOL, WM8731_RINVOL, 7, 1, 1),
 
-SOC_SINGLE("Mic Boost (+20dB)", WM8731_APANA, 0, 1, 0),
+SOC_SINGLE_TLV("Mic Boost Volume", WM8731_APANA, 0, 1, 0, mic_tlv),
 SOC_SINGLE("Mic Capture Switch", WM8731_APANA, 1, 1, 1),
 
 SOC_SINGLE_TLV("Sidetone Playback Volume", WM8731_APANA, 6, 3, 1,
                sidetone_tlv),
 
 SOC_SINGLE("ADC High Pass Filter Switch", WM8731_APDIGI, 0, 1, 1),
 SOC_SINGLE("Store DC Offset Switch", WM8731_APDIGI, 4, 1, 0),
 
-SOC_ENUM("Playback De-emphasis", wm8731_enum[1]),
+SOC_SINGLE_BOOL_EXT("Playback Deemphasis Switch", 0,
+                    wm8731_get_deemph, wm8731_put_deemph),
 };
 
 /* Output Mixer */
 static const struct snd_kcontrol_new wm8731_output_mixer_controls[] = {
 SOC_DAPM_SINGLE("Line Bypass Switch", WM8731_APANA, 3, 1, 0),
 SOC_DAPM_SINGLE("Mic Sidetone Switch", WM8731_APANA, 5, 1, 0),
 SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
 };
 
 /* Input mux */
 static const struct snd_kcontrol_new wm8731_input_mux_controls =
-SOC_DAPM_ENUM("Input Select", wm8731_enum[0]);
+SOC_DAPM_ENUM("Input Select", wm8731_insel_enum);
 
 static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("OSC", WM8731_PWR, 5, 1, NULL, 0),
 SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1,
         &wm8731_output_mixer_controls[0],
         ARRAY_SIZE(wm8731_output_mixer_controls)),
 SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM8731_PWR, 3, 1),
 SND_SOC_DAPM_OUTPUT("LOUT"),
 SND_SOC_DAPM_OUTPUT("LHPOUT"),
 SND_SOC_DAPM_OUTPUT("ROUT"),
@@ skipping 36 matching lines @@
         {"ADC", NULL, "Input Mux"},
 
         /* inputs */
         {"Line Input", NULL, "LLINEIN"},
         {"Line Input", NULL, "RLINEIN"},
         {"Mic Bias", NULL, "MICIN"},
 };
 
 static int wm8731_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8731_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8731_dapm_widgets,
                                   ARRAY_SIZE(wm8731_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 }
 
 struct _coeff_div {
         u32 mclk;
         u32 rate;
         u16 fs;
         u8 sr:4;
         u8 bosr:1;
@@ skipping 50 matching lines @@
                             struct snd_pcm_hw_params *params,
                             struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
         u16 iface = snd_soc_read(codec, WM8731_IFACE) & 0xfff3;
         int i = get_coeff(wm8731->sysclk, params_rate(params));
         u16 srate = (coeff_div[i].sr << 2) |
                 (coeff_div[i].bosr << 1) | coeff_div[i].usb;
 
+        wm8731->playback_fs = params_rate(params);
+
         snd_soc_write(codec, WM8731_SRATE, srate);
 
         /* bit size */
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
                 break;
         case SNDRV_PCM_FORMAT_S20_3LE:
                 iface |= 0x0004;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
                 iface |= 0x0008;
                 break;
         }
 
+        wm8731_set_deemph(codec);
+
         snd_soc_write(codec, WM8731_IFACE, iface);
         return 0;
 }
 
 static int wm8731_pcm_prepare(struct snd_pcm_substream *substream,
                               struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
 
         /* set active */
@@ skipping 46 matching lines @@
         case 12000000:
         case 12288000:
         case 16934400:
         case 18432000:
                 wm8731->sysclk = freq;
                 break;
         default:
                 return -EINVAL;
         }
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(&codec->dapm);
 
         return 0;
 }
 
 
 static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
                 unsigned int fmt)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
         u16 iface = 0;
@@ skipping 59 matching lines @@
         u8 data[2];
         u16 *cache = codec->reg_cache;
         u16 reg;
 
         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) {
                         ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies),
                                                     wm8731->supplies);
                         if (ret != 0)
                                 return ret;
 
                         /* Sync reg_cache with the hardware */
                         for (i = 0; i < ARRAY_SIZE(wm8731_reg); i++) {
                                 if (cache[i] == wm8731_reg[i])
                                         continue;
 
                                 data[0] = (i << 1) | ((cache[i] >> 8)
                                                       & 0x0001);
                                 data[1] = cache[i] & 0x00ff;
                                 codec->hw_write(codec->control_data, data, 2);
                         }
                 }
 
                 /* Clear PWROFF, gate CLKOUT, everything else as-is */
                 reg = snd_soc_read(codec, WM8731_PWR) & 0xff7f;
                 snd_soc_write(codec, WM8731_PWR, reg | 0x0040);
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, WM8731_ACTIVE, 0x0);
                 snd_soc_write(codec, WM8731_PWR, 0xffff);
                 regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
                                        wm8731->supplies);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8731_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8731_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8731_dai_ops = {
         .prepare        = wm8731_pcm_prepare,
@@ skipping 93 matching lines @@
         /* Regulators will have been enabled by bias management */
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 
         return 0;
 
 err_regulator_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 err_regulator_get:
         regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 
-        kfree(wm8731);
         return ret;
 }
 
 /* power down chip */
 static int wm8731_remove(struct snd_soc_codec *codec)
 {
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
 
         wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
@@ skipping 124 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8731_spi_driver);
 #endif
 }
 module_exit(wm8731_exit);
 
 MODULE_DESCRIPTION("ASoC WM8731 driver");
 MODULE_AUTHOR("Richard Purdie");
 MODULE_LICENSE("GPL");