Re: [alsa-devel] [PATCH 1/4] ASoC: add a WM8978 codec driver

Liam Girdwood
2010-01-19T10:46:04Z

Looks ok, some questions below.

On Tue, 2010-01-19 at 09:08 +0100, Guennadi Liakhovetski wrote:
> The WM8978 codec from Wolfson Microelectronics is very similar to wm8974, but
> is stereo and also has some differences in pin configuration and internal
> signal routing. This driver is based on wm8974 and takes the differences into
> account.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> I know there is a driver for this codec in wm git-tree and I did have a
> look at it. But, although both drivers have identical roots and look
> similar in many places, the other one implements much less functionality,
> doesn't seem to have been very intensively tested, and would require a
> substantial amount of work to bring it into shape. Whereas this driver has
> been tested, implements a few audio controls, and uses current ALSA / ASoC
> APIs. The only part, that's missing from this version, that is present in
> the wm driver is support for SPI, which can be added as required.
>
> sound/soc/codecs/Kconfig | 4 +
> sound/soc/codecs/Makefile | 2 +
> sound/soc/codecs/wm8978.c | 919 +++++++++++++++++++++++++++++++++++++++++++++
> sound/soc/codecs/wm8978.h | 84 ++++
> 4 files changed, 1009 insertions(+), 0 deletions(-)
> create mode 100644 sound/soc/codecs/wm8978.c
> create mode 100644 sound/soc/codecs/wm8978.h
>
> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> index 62ff26a..0aad72f 100644
> --- a/sound/soc/codecs/Kconfig
> +++ b/sound/soc/codecs/Kconfig
> @@ -57,6 +57,7 @@ config SND_SOC_ALL_CODECS
> select SND_SOC_WM8961 if I2C
> select SND_SOC_WM8971 if I2C
> select SND_SOC_WM8974 if I2C
> + select SND_SOC_WM8978 if I2C
> select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
> select SND_SOC_WM8990 if I2C
> select SND_SOC_WM8993 if I2C
> @@ -230,6 +231,9 @@ config SND_SOC_WM8971
> config SND_SOC_WM8974
> tristate
>
> +config SND_SOC_WM8978
> + tristate
> +
> config SND_SOC_WM8988
> tristate
>
> diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
> index ea98354..fbd290e 100644
> --- a/sound/soc/codecs/Makefile
> +++ b/sound/soc/codecs/Makefile
> @@ -44,6 +44,7 @@ snd-soc-wm8960-objs := wm8960.o
> snd-soc-wm8961-objs := wm8961.o
> snd-soc-wm8971-objs := wm8971.o
> snd-soc-wm8974-objs := wm8974.o
> +snd-soc-wm8978-objs := wm8978.o
> snd-soc-wm8988-objs := wm8988.o
> snd-soc-wm8990-objs := wm8990.o
> snd-soc-wm8993-objs := wm8993.o
> @@ -103,6 +104,7 @@ obj-$(CONFIG_SND_SOC_WM8960) += snd-soc-wm8960.o
> obj-$(CONFIG_SND_SOC_WM8961) += snd-soc-wm8961.o
> obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o
> obj-$(CONFIG_SND_SOC_WM8974) += snd-soc-wm8974.o
> +obj-$(CONFIG_SND_SOC_WM8978) += snd-soc-wm8978.o
> obj-$(CONFIG_SND_SOC_WM8988) += snd-soc-wm8988.o
> obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o
> obj-$(CONFIG_SND_SOC_WM8993) += snd-soc-wm8993.o
> diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
> new file mode 100644
> index 0000000..0f91d16
> --- /dev/null
> +++ b/sound/soc/codecs/wm8978.c
> @@ -0,0 +1,919 @@
> +/*
> + * wm8978.c -- WM8978 ALSA SoC Audio Codec driver
> + *
> + * Copyright (C) 2009-2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> + * Copyright (C) 2007 Carlos Munoz <carlos@kenati.com>
> + * Copyright 2006-2009 Wolfson Microelectronics PLC.
> + * Based on wm8974 and wm8990 by Liam Girdwood <lrg@slimlogic.co.uk>
> + *
> + * 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/kernel.h>
> +#include <linux/init.h>
> +#include <linux/delay.h>
> +#include <linux/pm.h>
> +#include <linux/i2c.h>
> +#include <linux/platform_device.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 <asm/div64.h>
> +
> +#include "wm8978.h"
> +
> +static struct snd_soc_codec *wm8978_codec;
> +
> +/* wm8978 register cache. Note that register 0 is not included in the cache. */
> +static const u16 wm8978_reg[WM8978_CACHEREGNUM] = {
> + 0x0000, 0x0000, 0x0000, 0x0000, /* 0x00...0x03 */
> + 0x0050, 0x0000, 0x0140, 0x0000, /* 0x04...0x07 */
> + 0x0000, 0x0000, 0x0000, 0x01ff, /* 0x08...0x0b */ /* 0x0b contains the VU bit */
> + 0x01ff, 0x0000, 0x0100, 0x01ff, /* 0x0c...0x0f */ /* 0x0c and 0x0f contain the VU bit */
> + 0x01ff, 0x0000, 0x012c, 0x002c, /* 0x10...0x13 */ /* 0x10 contains the VU bit */
> + 0x002c, 0x002c, 0x002c, 0x0000, /* 0x14...0x17 */
> + 0x0032, 0x0000, 0x0000, 0x0000, /* 0x18...0x1b */
> + 0x0000, 0x0000, 0x0000, 0x0000, /* 0x1c...0x1f */
> + 0x0038, 0x000b, 0x0032, 0x0000, /* 0x20...0x23 */
> + 0x0008, 0x000c, 0x0093, 0x00e9, /* 0x24...0x27 */
> + 0x0000, 0x0000, 0x0000, 0x0000, /* 0x28...0x2b */
> + 0x0033, 0x0110, 0x0110, 0x0100, /* 0x2c...0x2f */ /* 0x2d and 0x2e contain the VU bit */
> + 0x0100, 0x0002, 0x0001, 0x0001, /* 0x30...0x33 */
> + 0x0139, 0x0139, 0x0139, 0x0139, /* 0x34...0x37 */ /* all contain the VU bit */
> + 0x0001, 0x0001, /* 0x38...0x3b */
> +};
> +
> +/* codec private data */
> +struct wm8978_priv {
> + struct snd_soc_codec codec;
> + u16 reg_cache[WM8978_CACHEREGNUM];
> +};
> +
> +static const char *wm8978_companding[] = {"Off", "NC", "u-law", "A-law" };
> +static const char *wm8978_eqmode[] = {"Capture", "Playback" };
> +static const char *wm8978_bw[] = {"Narrow", "Wide" };
> +static const char *wm8978_eq1[] = {"80Hz", "105Hz", "135Hz", "175Hz" };
> +static const char *wm8978_eq2[] = {"230Hz", "300Hz", "385Hz", "500Hz" };
> +static const char *wm8978_eq3[] = {"650Hz", "850Hz", "1.1kHz", "1.4kHz" };
> +static const char *wm8978_eq4[] = {"1.8kHz", "2.4kHz", "3.2kHz", "4.1kHz" };
> +static const char *wm8978_eq5[] = {"5.3kHz", "6.9kHz", "9kHz", "11.7kHz" };
> +static const char *wm8978_alc3[] = {"ALC", "Limiter" };
> +static const char *wm8978_alc1[] = {"Off", "Right", "Left", "Both" };
> +
> +#define ARRAY_SINGLE(xreg, xshift, xtexts) SOC_ENUM_SINGLE(xreg, xshift, \
> + ARRAY_SIZE(xtexts), xtexts)
> +
> +static const struct soc_enum wm8978_enum[] = {
> + /* adc */
> + ARRAY_SINGLE(WM8978_COMPANDING_CONTROL, 1, wm8978_companding),
> + /* dac */
> + ARRAY_SINGLE(WM8978_COMPANDING_CONTROL, 3, wm8978_companding),
> + ARRAY_SINGLE(WM8978_EQ1, 8, wm8978_eqmode),
> +
> + ARRAY_SINGLE(WM8978_EQ1, 5, wm8978_eq1),
> + ARRAY_SINGLE(WM8978_EQ2, 8, wm8978_bw),
> + ARRAY_SINGLE(WM8978_EQ2, 5, wm8978_eq2),
> + ARRAY_SINGLE(WM8978_EQ3, 8, wm8978_bw),
> +
> + ARRAY_SINGLE(WM8978_EQ3, 5, wm8978_eq3),
> + ARRAY_SINGLE(WM8978_EQ4, 8, wm8978_bw),
> + ARRAY_SINGLE(WM8978_EQ4, 5, wm8978_eq4),
> + ARRAY_SINGLE(WM8978_EQ5, 8, wm8978_bw),
> +
> + ARRAY_SINGLE(WM8978_EQ5, 5, wm8978_eq5),
> + ARRAY_SINGLE(WM8978_ALC_CONTROL_3, 8, wm8978_alc3),
> + ARRAY_SINGLE(WM8978_ALC_CONTROL_1, 7, wm8978_alc1),
> +};
> +
> +static const DECLARE_TLV_DB_SCALE(digital_tlv, -12750, 50, 1);
> +static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);
> +static const DECLARE_TLV_DB_SCALE(inpga_tlv, -1200, 75, 0);
> +static const DECLARE_TLV_DB_SCALE(spk_tlv, -5700, 100, 0);
> +
> +static const struct snd_kcontrol_new wm8978_snd_controls[] = {
> +
> +SOC_SINGLE("Digital Loopback Switch", WM8978_COMPANDING_CONTROL, 0, 1, 0),
> +
> +SOC_ENUM("ADC Companding", wm8978_enum[0]),
> +SOC_ENUM("DAC Companding", wm8978_enum[1]),
> +
> +SOC_SINGLE("DAC Inversion Switch", WM8978_DAC_CONTROL, 0, 1, 0),
> +
> +SOC_SINGLE_TLV("Left PCM Volume",
> + WM8978_LEFT_DAC_DIGITAL_VOLUME, 0, 255, 0, digital_tlv),
> +SOC_SINGLE_TLV("Right PCM Volume",
> + WM8978_RIGHT_DAC_DIGITAL_VOLUME, 0, 255, 0, digital_tlv),
> +
> +SOC_SINGLE("High Pass Filter Switch", WM8978_ADC_CONTROL, 8, 1, 0),
> +SOC_SINGLE("High Pass Cut Off", WM8978_ADC_CONTROL, 4, 7, 0),
> +SOC_SINGLE("Left ADC Inversion Switch", WM8978_ADC_CONTROL, 0, 1, 0),
> +SOC_SINGLE("Right ADC Inversion Switch", WM8978_ADC_CONTROL, 1, 1, 0),
> +
> +SOC_SINGLE_TLV("Left Capture Volume",
> + WM8978_LEFT_ADC_DIGITAL_VOLUME, 0, 255, 0, digital_tlv),
> +SOC_SINGLE_TLV("Right Capture Volume",
> + WM8978_RIGHT_ADC_DIGITAL_VOLUME, 0, 255, 0, digital_tlv),
> +
> +SOC_ENUM("Equaliser Function", wm8978_enum[2]),
> +SOC_ENUM("EQ1 Cut Off", wm8978_enum[3]),
> +SOC_SINGLE_TLV("EQ1 Volume", WM8978_EQ1, 0, 24, 1, eq_tlv),
> +
> +SOC_ENUM("Equaliser EQ2 Bandwith", wm8978_enum[4]),
> +SOC_ENUM("EQ2 Cut Off", wm8978_enum[5]),
> +SOC_SINGLE_TLV("EQ2 Volume", WM8978_EQ2, 0, 24, 1, eq_tlv),
> +
> +SOC_ENUM("Equaliser EQ3 Bandwith", wm8978_enum[6]),
> +SOC_ENUM("EQ3 Cut Off", wm8978_enum[7]),
> +SOC_SINGLE_TLV("EQ3 Volume", WM8978_EQ3, 0, 24, 1, eq_tlv),
> +
> +SOC_ENUM("Equaliser EQ4 Bandwith", wm8978_enum[8]),
> +SOC_ENUM("EQ4 Cut Off", wm8978_enum[9]),
> +SOC_SINGLE_TLV("EQ4 Volume", WM8978_EQ4, 0, 24, 1, eq_tlv),
> +
> +SOC_ENUM("Equaliser EQ5 Bandwith", wm8978_enum[10]),
> +SOC_ENUM("EQ5 Cut Off", wm8978_enum[11]),
> +SOC_SINGLE_TLV("EQ5 Volume", WM8978_EQ5, 0, 24, 1, eq_tlv),
> +
> +SOC_SINGLE("DAC Playback Limiter Switch", WM8978_DAC_LIMITER_1, 8, 1, 0),
> +SOC_SINGLE("DAC Playback Limiter Decay", WM8978_DAC_LIMITER_1, 4, 15, 0),
> +SOC_SINGLE("DAC Playback Limiter Attack", WM8978_DAC_LIMITER_1, 0, 15, 0),
> +
> +SOC_SINGLE("DAC Playback Limiter Threshold", WM8978_DAC_LIMITER_2, 4, 7, 0),
> +SOC_SINGLE("DAC Playback Limiter Boost", WM8978_DAC_LIMITER_2, 0, 15, 0),
> +
> +SOC_ENUM("ALC Enable Switch", wm8978_enum[13]),
> +SOC_SINGLE("ALC Capture Max Gain", WM8978_ALC_CONTROL_1, 3, 7, 0),
> +SOC_SINGLE("ALC Capture Min Gain", WM8978_ALC_CONTROL_1, 0, 7, 0),
> +
> +SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 7, 0),
> +SOC_SINGLE("ALC Capture Target", WM8978_ALC_CONTROL_2, 0, 15, 0),
> +
> +SOC_ENUM("ALC Capture Mode", wm8978_enum[12]),
> +SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 15, 0),
> +SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 15, 0),
> +
> +SOC_SINGLE("ALC Capture Noise Gate Switch", WM8978_NOISE_GATE, 3, 1, 0),
> +SOC_SINGLE("ALC Capture Noise Gate Threshold", WM8978_NOISE_GATE, 0, 7, 0),
> +
> +SOC_SINGLE("Left Capture PGA ZC Switch",
> + WM8978_LEFT_INP_PGA_CONTROL, 7, 1, 0),
> +SOC_SINGLE_TLV("Left Capture PGA Volume",
> + WM8978_LEFT_INP_PGA_CONTROL, 0, 63, 0, inpga_tlv),
> +SOC_SINGLE("Right Capture PGA ZC Switch",
> + WM8978_RIGHT_INP_PGA_CONTROL, 7, 1, 0),
> +SOC_SINGLE_TLV("Right Capture PGA Volume",
> + WM8978_RIGHT_INP_PGA_CONTROL, 0, 63, 0, inpga_tlv),
> +
> +/* OUT1 - HeadPhones */
> +SOC_SINGLE("Left HeadPhone Playback ZC Switch",
> + WM8978_LOUT1_HP_CONTROL, 7, 1, 0),

HeadPhone is usually "Headphone"

> +SOC_SINGLE("Left HeadPhone Playback Switch", WM8978_LOUT1_HP_CONTROL, 6, 1, 1),
> +SOC_SINGLE_TLV("Left HeadPhone Playback Volume",
> + WM8978_LOUT1_HP_CONTROL, 0, 63, 0, spk_tlv),
> +
> +SOC_SINGLE("Right HeadPhone Playback ZC Switch",
> + WM8978_ROUT1_HP_CONTROL, 7, 1, 0),
> +SOC_SINGLE("Right HeadPhone Playback Switch", WM8978_ROUT1_HP_CONTROL, 6, 1, 1),
> +SOC_SINGLE_TLV("Right HeadPhone Playback Volume",
> + WM8978_ROUT1_HP_CONTROL, 0, 63, 0, spk_tlv),
> +
> +/* OUT2 - Speakers */
> +SOC_SINGLE("Left Speaker Playback ZC Switch",
> + WM8978_LOUT2_SPK_CONTROL, 7, 1, 0),
> +SOC_SINGLE("Left Speaker Playback Switch", WM8978_LOUT2_SPK_CONTROL, 6, 1, 1),
> +SOC_SINGLE_TLV("Left Speaker Playback Volume",
> + WM8978_LOUT2_SPK_CONTROL, 0, 63, 0, spk_tlv),
> +
> +SOC_SINGLE("Right Speaker Playback ZC Switch",
> + WM8978_ROUT2_SPK_CONTROL, 7, 1, 0),
> +SOC_SINGLE("Right Speaker Playback Switch", WM8978_ROUT2_SPK_CONTROL, 6, 1, 1),
> +SOC_SINGLE_TLV("Right Speaker Playback Volume",
> + WM8978_ROUT2_SPK_CONTROL, 0, 63, 0, spk_tlv),
> +
> +SOC_SINGLE("Left Capture Boost(+20dB)",
> + WM8978_LEFT_ADC_BOOST_CONTROL, 8, 1, 0),
> +SOC_SINGLE("Right Capture Boost(+20dB)",
> + WM8978_RIGHT_ADC_BOOST_CONTROL, 8, 1, 0),
> +
> +/* OUT3/4 - Line Output */
> +SOC_SINGLE("Left Line Playback Switch", WM8978_OUT3_MIXER_CONTROL, 6, 1, 1),
> +SOC_SINGLE("Right Line Playback Switch", WM8978_OUT4_MIXER_CONTROL, 6, 1, 1),
> +};
> +
> +/* Mixer #1: Output (OUT1, OUT2) Mixer: mix AUX, Input mixer output and DAC */
> +static const struct snd_kcontrol_new wm8978_left_out_mixer[] = {
> +SOC_DAPM_SINGLE("Line Bypass Switch", WM8978_LEFT_MIXER_CONTROL, 1, 1, 0),
> +SOC_DAPM_SINGLE("Aux Playback Switch", WM8978_LEFT_MIXER_CONTROL, 5, 1, 0),
> +SOC_DAPM_SINGLE("PCM Playback Switch", WM8978_LEFT_MIXER_CONTROL, 0, 1, 1),
> +};
> +
> +static const struct snd_kcontrol_new wm8978_right_out_mixer[] = {
> +SOC_DAPM_SINGLE("Line Bypass Switch", WM8978_RIGHT_MIXER_CONTROL, 1, 1, 0),
> +SOC_DAPM_SINGLE("Aux Playback Switch", WM8978_RIGHT_MIXER_CONTROL, 5, 1, 0),
> +SOC_DAPM_SINGLE("PCM Playback Switch", WM8978_RIGHT_MIXER_CONTROL, 0, 1, 1),
> +};
> +
> +/* OUT3/OUT4 Mixer not implemented */
> +
> +/* Mixer #2: Input PGA Mute */
> +static const struct snd_kcontrol_new wm8978_left_inpga[] = {
> +SOC_DAPM_SINGLE("L2 Switch", WM8978_INPUT_CONTROL, 2, 1, 0),
> +SOC_DAPM_SINGLE("Left MicN Switch", WM8978_INPUT_CONTROL, 1, 1, 0),
> +SOC_DAPM_SINGLE("Left MicP Switch", WM8978_INPUT_CONTROL, 0, 1, 0),
> +};
> +static const struct snd_kcontrol_new wm8978_right_inpga[] = {
> +SOC_DAPM_SINGLE("R2 Switch", WM8978_INPUT_CONTROL, 6, 1, 0),
> +SOC_DAPM_SINGLE("Right MicN Switch", WM8978_INPUT_CONTROL, 5, 1, 0),
> +SOC_DAPM_SINGLE("Right MicP Switch", WM8978_INPUT_CONTROL, 4, 1, 0),
> +};
> +
> +/* Mixer #3: Boost (Input) mixer */
> +static const struct snd_kcontrol_new wm8978_left_boost_mixer[] = {
> +SOC_DAPM_SINGLE("Left PGA Mute", WM8978_LEFT_INP_PGA_CONTROL, 6, 1, 0),
> +};
> +static const struct snd_kcontrol_new wm8978_right_boost_mixer[] = {
> +SOC_DAPM_SINGLE("Right PGA Mute", WM8978_RIGHT_INP_PGA_CONTROL, 6, 1, 0),
> +};
> +
> +/* AUX Input boost vol */
> +static const struct snd_kcontrol_new wm8978_aux_boost_controls[] = {
> +SOC_DAPM_SINGLE("Left Aux Volume", WM8978_LEFT_ADC_BOOST_CONTROL, 0, 7, 0),
> +SOC_DAPM_SINGLE("Right Aux Volume", WM8978_RIGHT_ADC_BOOST_CONTROL, 0, 7, 0),
> +};
> +
> +/* Mic Input boost vol */
> +static const struct snd_kcontrol_new wm8978_mic_boost_controls[] = {
> +SOC_DAPM_SINGLE("Left Mic Volume", WM8978_LEFT_ADC_BOOST_CONTROL, 4, 7, 0),
> +SOC_DAPM_SINGLE("Right Mic Volume", WM8978_RIGHT_ADC_BOOST_CONTROL, 4, 7, 0),
> +};
> +
> +#define MIXER_ARRAY(n, r, s, i, m) SND_SOC_DAPM_MIXER(n, r, s, i, \
> + m, ARRAY_SIZE(m))

I'd be tempted to rename this and add to soc-dapm.h

> +
> +static const struct snd_soc_dapm_widget wm8978_dapm_widgets[] = {
> +SND_SOC_DAPM_DAC("Left DAC", "Left HiFi Playback", WM8978_POWER_MANAGEMENT_3, 0, 0),
> +SND_SOC_DAPM_DAC("Right DAC", "Right HiFi Playback", WM8978_POWER_MANAGEMENT_3, 1, 0),
> +SND_SOC_DAPM_ADC("Left ADC", "Left HiFi Capture", WM8978_POWER_MANAGEMENT_2, 0, 0),
> +SND_SOC_DAPM_ADC("Right ADC", "Right HiFi Capture", WM8978_POWER_MANAGEMENT_2, 1, 0),
> +
> +SND_SOC_DAPM_PGA("Left Speaker Out", WM8978_POWER_MANAGEMENT_3, 6, 0, NULL, 0),
> +SND_SOC_DAPM_PGA("Right Speaker Out", WM8978_POWER_MANAGEMENT_3, 5, 0, NULL, 0),
> +SND_SOC_DAPM_PGA("Left Headphone Out", WM8978_POWER_MANAGEMENT_2, 7, 0, NULL, 0),
> +SND_SOC_DAPM_PGA("Right Headphone Out", WM8978_POWER_MANAGEMENT_2, 8, 0, NULL, 0),
> +
> +/* Mixer #1: OUT1,2 */
> +MIXER_ARRAY("Left Output Mixer", WM8978_POWER_MANAGEMENT_2, 2, 0,
> + wm8978_left_out_mixer),
> +MIXER_ARRAY("Right Output Mixer", WM8978_POWER_MANAGEMENT_2, 2, 0,
> + wm8978_right_out_mixer),
> +
> +MIXER_ARRAY("Left Input PGA", WM8978_POWER_MANAGEMENT_2, 2, 0,
> + wm8978_left_inpga),
> +MIXER_ARRAY("Right Input PGA", WM8978_POWER_MANAGEMENT_2, 3, 0,
> + wm8978_right_inpga),
> +
> +MIXER_ARRAY("Left Boost Mixer", WM8978_POWER_MANAGEMENT_2, 4, 0,
> + wm8978_left_boost_mixer),
> +MIXER_ARRAY("Right Boost Mixer", WM8978_POWER_MANAGEMENT_2, 5, 0,
> + wm8978_right_boost_mixer),
> +
> +SND_SOC_DAPM_MICBIAS("Mic Bias", WM8978_POWER_MANAGEMENT_1, 4, 0),
> +
> +SND_SOC_DAPM_INPUT("LMICN"),
> +SND_SOC_DAPM_INPUT("LMICP"),
> +SND_SOC_DAPM_INPUT("RMICN"),
> +SND_SOC_DAPM_INPUT("RMICP"),
> +SND_SOC_DAPM_INPUT("LAUX"),
> +SND_SOC_DAPM_INPUT("RAUX"),
> +SND_SOC_DAPM_INPUT("L2"),
> +SND_SOC_DAPM_INPUT("R2"),
> +SND_SOC_DAPM_OUTPUT("LHP"),
> +SND_SOC_DAPM_OUTPUT("RHP"),
> +SND_SOC_DAPM_OUTPUT("LSPK"),
> +SND_SOC_DAPM_OUTPUT("RSPK"),
> +};
> +
> +static const struct snd_soc_dapm_route audio_map[] = {
> + /* Output mixer */
> + {"Right Output Mixer", "PCM Playback Switch", "Right DAC"},
> + {"Right Output Mixer", "Aux Playback Switch", "RAUX"},
> + {"Right Output Mixer", "Line Bypass Switch", "Right Boost Mixer"},
> +
> + {"Left Output Mixer", "PCM Playback Switch", "Left DAC"},
> + {"Left Output Mixer", "Aux Playback Switch", "LAUX"},
> + {"Left Output Mixer", "Line Bypass Switch", "Left Boost Mixer"},
> +
> + /* Outputs */
> + {"Right Headphone Out", NULL, "Right Output Mixer"},
> + {"RHP", NULL, "Right Headphone Out"},
> +
> + {"Left Headphone Out", NULL, "Left Output Mixer"},
> + {"LHP", NULL, "Left Headphone Out"},
> +
> + {"Right Speaker Out", NULL, "Right Output Mixer"},
> + {"RSPK", NULL, "Right Speaker Out"},
> +
> + {"Left Speaker Out", NULL, "Left Output Mixer"},
> + {"LSPK", NULL, "Left Speaker Out"},
> +
> + /* Boost Mixer */
> + {"Right ADC", NULL, "Right Boost Mixer"},
> +
> + {"Right Boost Mixer", NULL, "RAUX"},
> + {"Right Boost Mixer", NULL, "Right Input PGA"},
> + {"Right Boost Mixer", NULL, "R2"},
> +
> + {"Left ADC", NULL, "Left Boost Mixer"},
> +
> + {"Left Boost Mixer", NULL, "LAUX"},
> + {"Left Boost Mixer", NULL, "Left Input PGA"},
> + {"Left Boost Mixer", NULL, "L2"},
> +
> + /* Input PGA */
> + {"Right Input PGA", "R2 Switch", "R2"},
> + {"Right Input PGA", "Right MicN Switch", "RMICN"},
> + {"Right Input PGA", "Right MicP Switch", "RMICP"},
> +
> + {"Left Input PGA", "L2 Switch", "L2"},
> + {"Left Input PGA", "Left MicN Switch", "LMICN"},
> + {"Left Input PGA", "Left MicP Switch", "LMICP"},
> +};
> +
> +static int wm8978_add_widgets(struct snd_soc_codec *codec)
> +{
> + snd_soc_dapm_new_controls(codec, wm8978_dapm_widgets,
> + ARRAY_SIZE(wm8978_dapm_widgets));
> +
> + /* set up the WM8978 audio map */
> + snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
> +
> + return 0;
> +}
> +
> +/* PLL divisors */
> +struct wm8978_pll_div {
> + u32 k;
> + u8 n;
> + u8 div2;
> +};
> +
> +#define FIXED_PLL_SIZE (1 << 24)
> +
> +static void pll_factors(struct wm8978_pll_div *pll_div, unsigned int target,
> + unsigned int source)
> +{
> + u64 Kpart;
> + unsigned int K, Ndiv, Nmod;
> +
> + Ndiv = target / source;
> + if (Ndiv < 6) {
> + source >>= 1;
> + pll_div->div2 = 1;
> + Ndiv = target / source;
> + } else {
> + pll_div->div2 = 0;
> + }
> +

I would personally not put the extra { here

> + if (Ndiv < 6 || Ndiv > 12)
> + dev_warn(wm8978_codec->dev,
> + "WM8978 N value exceeds recommended range! N = %u\n",
> + Ndiv);
> +
> + pll_div->n = Ndiv;
> + Nmod = target - source * Ndiv;
> + Kpart = FIXED_PLL_SIZE * (long long)Nmod + source / 2;
> +
> + do_div(Kpart, source);
> +
> + K = Kpart & 0xFFFFFFFF;
> +
> + pll_div->k = K;
> +}
> +
> +static int wm8978_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
> + int source, unsigned int freq_in, unsigned int freq_out)
> +{
> + struct snd_soc_codec *codec = codec_dai->codec;
> + struct wm8978_pll_div pll_div;
> + u16 reg;
> +
> + if (freq_in = 0 || freq_out = 0) {
> + /* Clock CODEC directly from MCLK */
> + reg = snd_soc_read(codec, WM8978_CLOCKING);
> + snd_soc_write(codec, WM8978_CLOCKING, reg & ~0x100);
> +
> + /* Turn off PLL */
> + reg = snd_soc_read(codec, WM8978_POWER_MANAGEMENT_1);
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, reg & ~0x20);
> + return 0;
> + }
> +
> + pll_factors(&pll_div, freq_out, freq_in);
> +
> + dev_dbg(codec->dev, "%s: calculated PLL N=0x%x, K=0x%x, div2=%d\n",
> + __func__, pll_div.n, pll_div.k, pll_div.div2);
> +
> + snd_soc_write(codec, WM8978_PLL_N, (pll_div.div2 << 4) | pll_div.n);
> + snd_soc_write(codec, WM8978_PLL_K1, pll_div.k >> 18);
> + snd_soc_write(codec, WM8978_PLL_K2, (pll_div.k >> 9) & 0x1ff);
> + snd_soc_write(codec, WM8978_PLL_K3, pll_div.k & 0x1ff);
> + reg = snd_soc_read(codec, WM8978_POWER_MANAGEMENT_1);
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, reg | 0x020);
> + /* Output PLL to GPIO1 */
> + snd_soc_write(codec, WM8978_GPIO_CONTROL,
> + snd_soc_read(codec, WM8978_GPIO_CONTROL) | 0x4);
> +
> + /* Run CODEC from PLL instead of MCLK */
> + reg = snd_soc_read(codec, WM8978_CLOCKING);
> + snd_soc_write(codec, WM8978_CLOCKING, reg | 0x100);
> +
> + return 0;
> +}
> +
> +/*
> + * Configure WM8978 clock dividers.
> + */
> +static int wm8978_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
> + int div_id, int div)
> +{
> + struct snd_soc_codec *codec = codec_dai->codec;
> + u16 reg;
> +
> + switch (div_id) {
> + case WM8978_OPCLKDIV:
> + reg = snd_soc_read(codec, WM8978_GPIO_CONTROL) & 0x1cf;
> + snd_soc_write(codec, WM8978_GPIO_CONTROL, reg | div);
> + break;
> + case WM8978_MCLKDIV:
> + reg = snd_soc_read(codec, WM8978_CLOCKING) & 0x11f;
> + snd_soc_write(codec, WM8978_CLOCKING, reg | div);
> + break;
> + case WM8978_ADCCLK:
> + reg = snd_soc_read(codec, WM8978_ADC_CONTROL) & 0x1f7;
> + snd_soc_write(codec, WM8978_ADC_CONTROL, reg | div);
> + break;
> + case WM8978_DACCLK:
> + reg = snd_soc_read(codec, WM8978_DAC_CONTROL) & 0x1f7;
> + snd_soc_write(codec, WM8978_DAC_CONTROL, reg | div);
> + break;
> + case WM8978_BCLKDIV:
> + reg = snd_soc_read(codec, WM8978_CLOCKING) & 0x1e3;
> + snd_soc_write(codec, WM8978_CLOCKING, reg | div);
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + dev_dbg(codec->dev, "%s: ID %d, value %x\n",
> + __func__, div_id, reg | div);
> +
> + return 0;
> +}
> +
> +/*
> + * Set ADC and Voice DAC format.
> + */
> +static int wm8978_set_dai_fmt(struct snd_soc_dai *codec_dai,
> + unsigned int fmt)
> +{
> + struct snd_soc_codec *codec = codec_dai->codec;
> + u16 iface = snd_soc_read(codec, WM8978_AUDIO_INTERFACE) & ~0x198;
> + u16 clk = snd_soc_read(codec, WM8978_CLOCKING);
> +
> + /* set master/slave audio interface */
> + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> + case SND_SOC_DAIFMT_CBM_CFM:
> + clk |= 1;
> + break;
> + case SND_SOC_DAIFMT_CBS_CFS:
> + clk &= ~1;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + /* interface format */
> + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
> + case SND_SOC_DAIFMT_I2S:
> + iface |= 0x10;
> + break;
> + case SND_SOC_DAIFMT_RIGHT_J:
> + break;
> + case SND_SOC_DAIFMT_LEFT_J:
> + iface |= 0x8;
> + break;
> + case SND_SOC_DAIFMT_DSP_A:
> + iface |= 0x18;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + /* clock inversion */
> + switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
> + case SND_SOC_DAIFMT_NB_NF:
> + break;
> + case SND_SOC_DAIFMT_IB_IF:
> + iface |= 0x180;
> + break;
> + case SND_SOC_DAIFMT_IB_NF:
> + iface |= 0x100;
> + break;
> + case SND_SOC_DAIFMT_NB_IF:
> + iface |= 0x80;
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + snd_soc_write(codec, WM8978_AUDIO_INTERFACE, iface);
> + snd_soc_write(codec, WM8978_CLOCKING, clk);
> +
> + return 0;
> +}
> +
> +/*
> + * Set PCM DAI bit size and sample rate.
> + */
> +static int wm8978_hw_params(struct snd_pcm_substream *substream,
> + struct snd_pcm_hw_params *params,
> + struct snd_soc_dai *dai)
> +{
> + struct snd_soc_pcm_runtime *rtd = substream->private_data;
> + struct snd_soc_device *socdev = rtd->socdev;
> + struct snd_soc_codec *codec = socdev->card->codec;
> + u16 iface_ctl = snd_soc_read(codec, WM8978_AUDIO_INTERFACE) & ~0x60;
> + u16 add_ctl = snd_soc_read(codec, WM8978_ADDITIONAL_CONTROL) & ~0xe;
> +
> + dev_dbg(codec->dev, "%s: fmt %d, rate %u\n", __func__,
> + params_format(params), params_rate(params));
> +
> + /* bit size */
> + switch (params_format(params)) {
> + case SNDRV_PCM_FORMAT_S16_LE:
> + break;
> + case SNDRV_PCM_FORMAT_S20_3LE:
> + iface_ctl |= 0x20;
> + break;
> + case SNDRV_PCM_FORMAT_S24_LE:
> + iface_ctl |= 0x40;
> + break;
> + case SNDRV_PCM_FORMAT_S32_LE:
> + iface_ctl |= 0x60;
> + break;
> + }
> +
> + /* filter coefficient */
> + switch (params_rate(params)) {
> + case 8000:
> + add_ctl |= 0x5 << 1;
> + break;
> + case 11025:
> + add_ctl |= 0x4 << 1;
> + break;
> + case 16000:
> + add_ctl |= 0x3 << 1;
> + break;
> + case 22050:
> + add_ctl |= 0x2 << 1;
> + break;
> + case 32000:
> + add_ctl |= 0x1 << 1;
> + break;
> + case 44100:
> + case 48000:
> + break;
> + }
> +
> + snd_soc_write(codec, WM8978_AUDIO_INTERFACE, iface_ctl);
> + snd_soc_write(codec, WM8978_ADDITIONAL_CONTROL, add_ctl);
> +
> + /* Mic bias */
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1,
> + (snd_soc_read(codec, 1) & ~4) | 0x10);
> +
> + /* Out-1 enabled, left/right input channel enabled */
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_2, 0x1bf);
> +
> + /* Out-2 disabled, right/left output channel enabled, dac enabled */
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_3, 0x10f);

Power stuff should be in either dapm or bias functions.

> +
> + return 0;
> +}
> +
> +static int wm8978_mute(struct snd_soc_dai *dai, int mute)
> +{
> + struct snd_soc_codec *codec = dai->codec;
> + u16 val = snd_soc_read(codec, WM8978_DAC_CONTROL);
> +
> + dev_dbg(codec->dev, "%s: %d\n", __func__, mute);
> +
> + if (mute)
> + snd_soc_write(codec, WM8978_DAC_CONTROL, val | 0x40);
> + else
> + snd_soc_write(codec, WM8978_DAC_CONTROL, val & ~0x40);
> +
> + return 0;
> +}
> +
> +static int wm8978_set_bias_level(struct snd_soc_codec *codec,
> + enum snd_soc_bias_level level)
> +{
> + u16 power1 = snd_soc_read(codec, WM8978_POWER_MANAGEMENT_1) & ~3;
> +
> + switch (level) {
> + case SND_SOC_BIAS_ON:
> + case SND_SOC_BIAS_PREPARE:
> + power1 |= 1; /* VMID 75k */
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, power1);
> + break;
> + case SND_SOC_BIAS_STANDBY:
> + power1 |= 0xC;
> +
> + if (codec->bias_level = SND_SOC_BIAS_OFF) {
> + /* Initial cap charge at VMID 5k */
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1,
> + power1 | 0x3);
> + mdelay(100);
> + }
> +
> + power1 |= 0x2; /* VMID 500k */
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, power1);
> + break;
> + case SND_SOC_BIAS_OFF:
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, 0);
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_2, 0);
> + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_3, 0);
> + break;
> + }
> +
> + dev_dbg(codec->dev, "%s: %d, %u\n", __func__, level, power1);
> +
> + codec->bias_level = level;
> + return 0;
> +}
> +
> +/* Also supports 12kHz */
> +#define WM8978_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | \
> + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | \
> + SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
> +
> +#define WM8978_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
> + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
> +
> +static struct snd_soc_dai_ops wm8978_dai_ops = {
> + .hw_params = wm8978_hw_params,
> + .digital_mute = wm8978_mute,
> + .set_fmt = wm8978_set_dai_fmt,
> + .set_clkdiv = wm8978_set_dai_clkdiv,
> + .set_pll = wm8978_set_dai_pll,
> +};
> +
> +struct snd_soc_dai wm8978_dai = {
> + .name = "WM8978 HiFi",
> + .id = 1,
> + .playback = {
> + .stream_name = "Playback",
> + .channels_min = 1,
> + .channels_max = 2,
> + .rates = WM8978_RATES,
> + .formats = WM8978_FORMATS,
> + },
> + .capture = {
> + .stream_name = "Capture",
> + .channels_min = 1,
> + .channels_max = 2,
> + .rates = WM8978_RATES,
> + .formats = WM8978_FORMATS,
> + },
> + .ops = &wm8978_dai_ops,
> +};
> +EXPORT_SYMBOL_GPL(wm8978_dai);
> +
> +static int wm8978_suspend(struct platform_device *pdev, pm_message_t state)
> +{
> + struct snd_soc_device *socdev = platform_get_drvdata(pdev);
> + struct snd_soc_codec *codec = socdev->card->codec;
> +
> + /* we only need to suspend if we are a valid card */
> + if (!codec->card)
> + return 0;
> +
> + wm8978_set_bias_level(codec, SND_SOC_BIAS_OFF);
> + return 0;
> +}
> +
> +static int wm8978_resume(struct platform_device *pdev)
> +{
> + struct snd_soc_device *socdev = platform_get_drvdata(pdev);
> + struct snd_soc_codec *codec = socdev->card->codec;
> + int i;
> + u16 data;
> + u16 *cache = codec->reg_cache;
> +
> + /* we only need to resume if we are a valid card */
> + if (!codec->card)
> + return 0;
> +
> + /* Sync reg_cache with the hardware */
> + for (i = 0; i < ARRAY_SIZE(wm8978_reg); i++) {
> + if (i = WM8978_RESET)
> + continue;
> + data = cpu_to_be16((i << 9) | (cache[i] & 0x1ff));
> + codec->hw_write(codec->control_data, (char *)&data, 2);
> + }
> +
> + wm8978_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
> + return 0;
> +}
> +
> +static int wm8978_probe(struct platform_device *pdev)
> +{
> + struct snd_soc_device *socdev = platform_get_drvdata(pdev);
> + struct snd_soc_codec *codec;
> + int ret = 0;
> +
> + if (wm8978_codec = NULL) {
> + dev_err(&pdev->dev, "Codec device not registered\n");
> + return -ENODEV;
> + }
> +
> + socdev->card->codec = wm8978_codec;
> + codec = wm8978_codec;
> +
> + /* register pcms */
> + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
> + if (ret < 0) {
> + dev_err(codec->dev, "failed to create pcms: %d\n", ret);
> + goto pcm_err;
> + }
> +
> + snd_soc_add_controls(codec, wm8978_snd_controls,
> + ARRAY_SIZE(wm8978_snd_controls));
> + wm8978_add_widgets(codec);
> +
> +pcm_err:
> + return ret;
> +}
> +
> +/* power down chip */
> +static int wm8978_remove(struct platform_device *pdev)
> +{
> + struct snd_soc_device *socdev = platform_get_drvdata(pdev);
> +
> + snd_soc_free_pcms(socdev);
> + snd_soc_dapm_free(socdev);
> +
> + return 0;
> +}
> +
> +struct snd_soc_codec_device soc_codec_dev_wm8978 = {
> + .probe = wm8978_probe,
> + .remove = wm8978_remove,
> + .suspend = wm8978_suspend,
> + .resume = wm8978_resume,
> +};
> +EXPORT_SYMBOL_GPL(soc_codec_dev_wm8978);
> +
> +static __devinit int wm8978_register(struct wm8978_priv *wm8978)
> +{
> + int ret;
> + struct snd_soc_codec *codec = &wm8978->codec;
> +
> + if (wm8978_codec) {
> + dev_err(codec->dev, "Another WM8978 is registered\n");
> + return -EINVAL;
> + }
> +
> + mutex_init(&codec->mutex);
> + INIT_LIST_HEAD(&codec->dapm_widgets);
> + INIT_LIST_HEAD(&codec->dapm_paths);
> +
> + codec->private_data = wm8978;
> + codec->name = "WM8978";
> + codec->owner = THIS_MODULE;
> + codec->bias_level = SND_SOC_BIAS_OFF;
> + codec->set_bias_level = wm8978_set_bias_level;
> + codec->dai = &wm8978_dai;
> + codec->num_dai = 1;
> + codec->reg_cache_size = WM8978_CACHEREGNUM;
> + codec->reg_cache = &wm8978->reg_cache;
> +
> + ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
> + if (ret < 0) {
> + dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
> + goto err;
> + }
> +
> + memcpy(codec->reg_cache, wm8978_reg, sizeof(wm8978_reg));
> +
> + /* Reset the codec */
> + ret = snd_soc_write(codec, WM8978_RESET, 0);
> + if (ret < 0) {
> + dev_err(codec->dev, "Failed to issue reset\n");
> + goto err;
> + }
> +
> + wm8978_dai.dev = codec->dev;
> +
> + wm8978_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
> +
> + wm8978_codec = codec;
> +
> + ret = snd_soc_register_codec(codec);
> + if (ret != 0) {
> + dev_err(codec->dev, "Failed to register codec: %d\n", ret);
> + goto err;
> + }
> +
> + ret = snd_soc_register_dai(&wm8978_dai);
> + if (ret != 0) {
> + dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
> + goto err_codec;
> + }
> +
> + return 0;
> +
> +err_codec:
> + snd_soc_unregister_codec(codec);
> +err:
> + kfree(wm8978);
> + return ret;
> +}
> +
> +static __devexit void wm8978_unregister(struct wm8978_priv *wm8978)
> +{
> + wm8978_set_bias_level(&wm8978->codec, SND_SOC_BIAS_OFF);
> + snd_soc_unregister_dai(&wm8978_dai);
> + snd_soc_unregister_codec(&wm8978->codec);
> + kfree(wm8978);
> + wm8978_codec = NULL;
> +}
> +
> +static __devinit int wm8978_i2c_probe(struct i2c_client *i2c,
> + const struct i2c_device_id *id)
> +{
> + struct wm8978_priv *wm8978;
> + struct snd_soc_codec *codec;
> +
> + wm8978 = kzalloc(sizeof(struct wm8978_priv), GFP_KERNEL);
> + if (wm8978 = NULL)
> + return -ENOMEM;
> +
> + codec = &wm8978->codec;
> + codec->hw_write = (hw_write_t)i2c_master_send;
> +
> + i2c_set_clientdata(i2c, wm8978);
> + codec->control_data = i2c;
> +
> + codec->dev = &i2c->dev;
> +
> + return wm8978_register(wm8978);
> +}
> +
> +static __devexit int wm8978_i2c_remove(struct i2c_client *client)
> +{
> + struct wm8978_priv *wm8978 = i2c_get_clientdata(client);
> + wm8978_unregister(wm8978);
> + return 0;
> +}
> +
> +static const struct i2c_device_id wm8978_i2c_id[] = {
> + { "wm8978", 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
> +
> +static struct i2c_driver wm8978_i2c_driver = {
> + .driver = {
> + .name = "WM8978",
> + .owner = THIS_MODULE,
> + },
> + .probe = wm8978_i2c_probe,
> + .remove = __devexit_p(wm8978_i2c_remove),
> + .id_table = wm8978_i2c_id,
> +};
> +
> +static int __init wm8978_modinit(void)
> +{
> + return i2c_add_driver(&wm8978_i2c_driver);
> +}
> +module_init(wm8978_modinit);
> +
> +static void __exit wm8978_exit(void)
> +{
> + i2c_del_driver(&wm8978_i2c_driver);
> +}
> +module_exit(wm8978_exit);
> +
> +MODULE_DESCRIPTION("ASoC WM8978 codec driver");
> +MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
> +MODULE_LICENSE("GPL");
> diff --git a/sound/soc/codecs/wm8978.h b/sound/soc/codecs/wm8978.h
> new file mode 100644
> index 0000000..61e39c0
> --- /dev/null
> +++ b/sound/soc/codecs/wm8978.h
> @@ -0,0 +1,84 @@
> +/*
> + * wm8978.h -- codec driver for WM8978
> + *
> + * Copyright 2009 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> + *
> + * 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.
> + */
> +
> +#ifndef __WM8978_H__
> +#define __WM8978_H__
> +
> +/*
> + * Register values.
> + */
> +#define WM8978_RESET 0x00
> +#define WM8978_POWER_MANAGEMENT_1 0x01
> +#define WM8978_POWER_MANAGEMENT_2 0x02
> +#define WM8978_POWER_MANAGEMENT_3 0x03
> +#define WM8978_AUDIO_INTERFACE 0x04
> +#define WM8978_COMPANDING_CONTROL 0x05
> +#define WM8978_CLOCKING 0x06
> +#define WM8978_ADDITIONAL_CONTROL 0x07
> +#define WM8978_GPIO_CONTROL 0x08
> +#define WM8978_JACK_DETECT_CONTROL_1 0x09
> +#define WM8978_DAC_CONTROL 0x0A
> +#define WM8978_LEFT_DAC_DIGITAL_VOLUME 0x0B
> +#define WM8978_RIGHT_DAC_DIGITAL_VOLUME 0x0C
> +#define WM8978_JACK_DETECT_CONTROL_2 0x0D
> +#define WM8978_ADC_CONTROL 0x0E
> +#define WM8978_LEFT_ADC_DIGITAL_VOLUME 0x0F
> +#define WM8978_RIGHT_ADC_DIGITAL_VOLUME 0x10
> +#define WM8978_EQ1 0x12
> +#define WM8978_EQ2 0x13
> +#define WM8978_EQ3 0x14
> +#define WM8978_EQ4 0x15
> +#define WM8978_EQ5 0x16
> +#define WM8978_DAC_LIMITER_1 0x18
> +#define WM8978_DAC_LIMITER_2 0x19
> +#define WM8978_NOTCH_FILTER_1 0x1b
> +#define WM8978_NOTCH_FILTER_2 0x1c
> +#define WM8978_NOTCH_FILTER_3 0x1d
> +#define WM8978_NOTCH_FILTER_4 0x1e
> +#define WM8978_ALC_CONTROL_1 0x20
> +#define WM8978_ALC_CONTROL_2 0x21
> +#define WM8978_ALC_CONTROL_3 0x22
> +#define WM8978_NOISE_GATE 0x23
> +#define WM8978_PLL_N 0x24
> +#define WM8978_PLL_K1 0x25
> +#define WM8978_PLL_K2 0x26
> +#define WM8978_PLL_K3 0x27
> +#define WM8978_3D_CONTROL 0x29
> +#define WM8978_BEEP_CONTROL 0x2b
> +#define WM8978_INPUT_CONTROL 0x2c
> +#define WM8978_LEFT_INP_PGA_CONTROL 0x2d
> +#define WM8978_RIGHT_INP_PGA_CONTROL 0x2e
> +#define WM8978_LEFT_ADC_BOOST_CONTROL 0x2f
> +#define WM8978_RIGHT_ADC_BOOST_CONTROL 0x30
> +#define WM8978_OUTPUT_CONTROL 0x31
> +#define WM8978_LEFT_MIXER_CONTROL 0x32
> +#define WM8978_RIGHT_MIXER_CONTROL 0x33
> +#define WM8978_LOUT1_HP_CONTROL 0x34
> +#define WM8978_ROUT1_HP_CONTROL 0x35
> +#define WM8978_LOUT2_SPK_CONTROL 0x36
> +#define WM8978_ROUT2_SPK_CONTROL 0x37
> +#define WM8978_OUT3_MIXER_CONTROL 0x38
> +#define WM8978_OUT4_MIXER_CONTROL 0x39
> +
> +#define WM8978_CACHEREGNUM 58
> +

It would be nice to have the relevant bits defined here for set_fmt()
etc instead of just the magic numbers used in the above codec driver.

> +/* Clock divider Id's */
> +enum wm8978_clk_id {
> + WM8978_OPCLKDIV,
> + WM8978_MCLKDIV,
> + WM8978_ADCCLK,
> + WM8978_DACCLK,
> + WM8978_BCLKDIV,
> +};
> +
> +extern struct snd_soc_dai wm8978_dai;
> +extern struct snd_soc_codec_device soc_codec_dev_wm8978;
> +
> +#endif /* __WM8978_H__ */