/*
* wm8974.c -- WM8974 ALSA Soc Audio driver
*
- * Copyright 2006 Wolfson Microelectronics PLC.
+ * Copyright 2006-2009 Wolfson Microelectronics PLC.
*
* Author: Liam Girdwood <linux@wolfsonmicro.com>
*
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <sound/initval.h>
+#include <sound/tlv.h>
#include "wm8974.h"
static struct snd_soc_codec *wm8974_codec;
-/*
- * read wm8974 register cache
- */
-static inline unsigned int wm8974_read_reg_cache(struct snd_soc_codec *codec,
- unsigned int reg)
-{
- u16 *cache = codec->reg_cache;
- if (reg == WM8974_RESET)
- return 0;
- if (reg >= WM8974_CACHEREGNUM)
- return -1;
- return cache[reg];
-}
-
-/*
- * write wm8974 register cache
- */
-static inline void wm8974_write_reg_cache(struct snd_soc_codec *codec,
- u16 reg, unsigned int value)
-{
- u16 *cache = codec->reg_cache;
- if (reg >= WM8974_CACHEREGNUM)
- return;
- cache[reg] = value;
-}
-
-/*
- * write to the WM8974 register space
- */
-static int wm8974_write(struct snd_soc_codec *codec, unsigned int reg,
- unsigned int value)
-{
- u8 data[2];
-
- /* data is
- * D15..D9 WM8974 register offset
- * D8...D0 register data
- */
- data[0] = (reg << 1) | ((value >> 8) & 0x0001);
- data[1] = value & 0x00ff;
-
- wm8974_write_reg_cache(codec, reg, value);
- if (codec->hw_write(codec->control_data, data, 2) == 2)
- return 0;
- else
- return -EIO;
-}
-
-#define wm8974_reset(c) wm8974_write(c, WM8974_RESET, 0)
+#define wm8974_reset(c) snd_soc_write(c, WM8974_RESET, 0)
static const char *wm8974_companding[] = {"Off", "NC", "u-law", "A-law" };
static const char *wm8974_deemp[] = {"None", "32kHz", "44.1kHz", "48kHz" };
SOC_ENUM_SINGLE(WM8974_ALC3, 8, 2, wm8974_alc),
};
+static const char *wm8974_auxmode_text[] = { "Buffer", "Mixer" };
+
+static const struct soc_enum wm8974_auxmode =
+ SOC_ENUM_SINGLE(WM8974_INPUT, 3, 2, wm8974_auxmode_text);
+
+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 wm8974_snd_controls[] = {
SOC_SINGLE("Digital Loopback Switch", WM8974_COMP, 0, 1, 0),
SOC_ENUM("Playback De-emphasis", wm8974_enum[2]),
SOC_SINGLE("DAC Inversion Switch", WM8974_DAC, 0, 1, 0),
-SOC_SINGLE("PCM Volume", WM8974_DACVOL, 0, 127, 0),
+SOC_SINGLE_TLV("PCM Volume", WM8974_DACVOL, 0, 255, 0, digital_tlv),
SOC_SINGLE("High Pass Filter Switch", WM8974_ADC, 8, 1, 0),
SOC_SINGLE("High Pass Cut Off", WM8974_ADC, 4, 7, 0),
-SOC_SINGLE("ADC Inversion Switch", WM8974_COMP, 0, 1, 0),
+SOC_SINGLE("ADC Inversion Switch", WM8974_ADC, 0, 1, 0),
-SOC_SINGLE("Capture Volume", WM8974_ADCVOL, 0, 127, 0),
+SOC_SINGLE_TLV("Capture Volume", WM8974_ADCVOL, 0, 255, 0, digital_tlv),
SOC_ENUM("Equaliser Function", wm8974_enum[3]),
SOC_ENUM("EQ1 Cut Off", wm8974_enum[4]),
-SOC_SINGLE("EQ1 Volume", WM8974_EQ1, 0, 31, 1),
+SOC_SINGLE_TLV("EQ1 Volume", WM8974_EQ1, 0, 24, 1, eq_tlv),
SOC_ENUM("Equaliser EQ2 Bandwith", wm8974_enum[5]),
SOC_ENUM("EQ2 Cut Off", wm8974_enum[6]),
-SOC_SINGLE("EQ2 Volume", WM8974_EQ2, 0, 31, 1),
+SOC_SINGLE_TLV("EQ2 Volume", WM8974_EQ2, 0, 24, 1, eq_tlv),
SOC_ENUM("Equaliser EQ3 Bandwith", wm8974_enum[7]),
SOC_ENUM("EQ3 Cut Off", wm8974_enum[8]),
-SOC_SINGLE("EQ3 Volume", WM8974_EQ3, 0, 31, 1),
+SOC_SINGLE_TLV("EQ3 Volume", WM8974_EQ3, 0, 24, 1, eq_tlv),
SOC_ENUM("Equaliser EQ4 Bandwith", wm8974_enum[9]),
SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]),
-SOC_SINGLE("EQ4 Volume", WM8974_EQ4, 0, 31, 1),
+SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv),
SOC_ENUM("Equaliser EQ5 Bandwith", wm8974_enum[11]),
SOC_ENUM("EQ5 Cut Off", wm8974_enum[12]),
-SOC_SINGLE("EQ5 Volume", WM8974_EQ5, 0, 31, 1),
+SOC_SINGLE_TLV("EQ5 Volume", WM8974_EQ5, 0, 24, 1, eq_tlv),
SOC_SINGLE("DAC Playback Limiter Switch", WM8974_DACLIM1, 8, 1, 0),
SOC_SINGLE("DAC Playback Limiter Decay", WM8974_DACLIM1, 4, 15, 0),
SOC_SINGLE("ALC Capture Noise Gate Threshold", WM8974_NGATE, 0, 7, 0),
SOC_SINGLE("Capture PGA ZC Switch", WM8974_INPPGA, 7, 1, 0),
-SOC_SINGLE("Capture PGA Volume", WM8974_INPPGA, 0, 63, 0),
+SOC_SINGLE_TLV("Capture PGA Volume", WM8974_INPPGA, 0, 63, 0, inpga_tlv),
SOC_SINGLE("Speaker Playback ZC Switch", WM8974_SPKVOL, 7, 1, 0),
SOC_SINGLE("Speaker Playback Switch", WM8974_SPKVOL, 6, 1, 1),
-SOC_SINGLE("Speaker Playback Volume", WM8974_SPKVOL, 0, 63, 0),
+SOC_SINGLE_TLV("Speaker Playback Volume", WM8974_SPKVOL, 0, 63, 0, spk_tlv),
+
+SOC_ENUM("Aux Mode", wm8974_auxmode),
SOC_SINGLE("Capture Boost(+20dB)", WM8974_ADCBOOST, 8, 1, 0),
-SOC_SINGLE("Mono Playback Switch", WM8974_MONOMIX, 6, 1, 0),
+SOC_SINGLE("Mono Playback Switch", WM8974_MONOMIX, 6, 1, 1),
};
/* Speaker Output Mixer */
static const struct snd_kcontrol_new wm8974_mono_mixer_controls[] = {
SOC_DAPM_SINGLE("Line Bypass Switch", WM8974_MONOMIX, 1, 1, 0),
SOC_DAPM_SINGLE("Aux Playback Switch", WM8974_MONOMIX, 2, 1, 0),
-SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_MONOMIX, 0, 1, 1),
+SOC_DAPM_SINGLE("PCM Playback Switch", WM8974_MONOMIX, 0, 1, 0),
+};
+
+/* Boost mixer */
+static const struct snd_kcontrol_new wm8974_boost_mixer[] = {
+SOC_DAPM_SINGLE("Aux Switch", WM8974_INPPGA, 6, 1, 0),
+};
+
+/* Input PGA */
+static const struct snd_kcontrol_new wm8974_inpga[] = {
+SOC_DAPM_SINGLE("Aux Switch", WM8974_INPUT, 2, 1, 0),
+SOC_DAPM_SINGLE("MicN Switch", WM8974_INPUT, 1, 1, 0),
+SOC_DAPM_SINGLE("MicP Switch", WM8974_INPUT, 0, 1, 0),
};
/* AUX Input boost vol */
static const struct snd_kcontrol_new wm8974_mic_boost_controls =
SOC_DAPM_SINGLE("Mic Volume", WM8974_ADCBOOST, 4, 7, 0);
-/* Capture boost switch */
-static const struct snd_kcontrol_new wm8974_capture_boost_controls =
-SOC_DAPM_SINGLE("Capture Boost Switch", WM8974_INPPGA, 6, 1, 0);
-
-/* Aux In to PGA */
-static const struct snd_kcontrol_new wm8974_aux_capture_boost_controls =
-SOC_DAPM_SINGLE("Aux Capture Boost Switch", WM8974_INPPGA, 2, 1, 0);
-
-/* Mic P In to PGA */
-static const struct snd_kcontrol_new wm8974_micp_capture_boost_controls =
-SOC_DAPM_SINGLE("Mic P Capture Boost Switch", WM8974_INPPGA, 0, 1, 0);
-
-/* Mic N In to PGA */
-static const struct snd_kcontrol_new wm8974_micn_capture_boost_controls =
-SOC_DAPM_SINGLE("Mic N Capture Boost Switch", WM8974_INPPGA, 1, 1, 0);
-
static const struct snd_soc_dapm_widget wm8974_dapm_widgets[] = {
SND_SOC_DAPM_MIXER("Speaker Mixer", WM8974_POWER3, 2, 0,
&wm8974_speaker_mixer_controls[0],
&wm8974_mono_mixer_controls[0],
ARRAY_SIZE(wm8974_mono_mixer_controls)),
SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM8974_POWER3, 0, 0),
-SND_SOC_DAPM_ADC("ADC", "HiFi Capture", WM8974_POWER3, 0, 0),
+SND_SOC_DAPM_ADC("ADC", "HiFi Capture", WM8974_POWER2, 0, 0),
SND_SOC_DAPM_PGA("Aux Input", WM8974_POWER1, 6, 0, NULL, 0),
SND_SOC_DAPM_PGA("SpkN Out", WM8974_POWER3, 5, 0, NULL, 0),
SND_SOC_DAPM_PGA("SpkP Out", WM8974_POWER3, 6, 0, NULL, 0),
SND_SOC_DAPM_PGA("Mono Out", WM8974_POWER3, 7, 0, NULL, 0),
-SND_SOC_DAPM_PGA("Mic PGA", WM8974_POWER2, 2, 0, NULL, 0),
-
-SND_SOC_DAPM_PGA("Aux Boost", SND_SOC_NOPM, 0, 0,
- &wm8974_aux_boost_controls, 1),
-SND_SOC_DAPM_PGA("Mic Boost", SND_SOC_NOPM, 0, 0,
- &wm8974_mic_boost_controls, 1),
-SND_SOC_DAPM_SWITCH("Capture Boost", SND_SOC_NOPM, 0, 0,
- &wm8974_capture_boost_controls),
-SND_SOC_DAPM_MIXER("Boost Mixer", WM8974_POWER2, 4, 0, NULL, 0),
+SND_SOC_DAPM_MIXER("Input PGA", WM8974_POWER2, 2, 0, wm8974_inpga,
+ ARRAY_SIZE(wm8974_inpga)),
+SND_SOC_DAPM_MIXER("Boost Mixer", WM8974_POWER2, 4, 0,
+ wm8974_boost_mixer, ARRAY_SIZE(wm8974_boost_mixer)),
SND_SOC_DAPM_MICBIAS("Mic Bias", WM8974_POWER1, 4, 0),
{"SPKOUTP", NULL, "SpkP Out"},
/* Boost Mixer */
- {"Boost Mixer", NULL, "ADC"},
- {"Capture Boost Switch", "Aux Capture Boost Switch", "AUX"},
- {"Aux Boost", "Aux Volume", "Boost Mixer"},
- {"Capture Boost", "Capture Switch", "Boost Mixer"},
- {"Mic Boost", "Mic Volume", "Boost Mixer"},
+ {"ADC", NULL, "Boost Mixer"},
+ {"Boost Mixer", "Aux Switch", "Aux Input"},
+ {"Boost Mixer", NULL, "Input PGA"},
+ {"Boost Mixer", NULL, "MICP"},
+
+ /* Input PGA */
+ {"Input PGA", "Aux Switch", "Aux Input"},
+ {"Input PGA", "MicN Switch", "MICN"},
+ {"Input PGA", "MicP Switch", "MICP"},
/* Inputs */
- {"MICP", NULL, "Mic Boost"},
- {"MICN", NULL, "Mic PGA"},
- {"Mic PGA", NULL, "Capture Boost"},
- {"AUX", NULL, "Aux Input"},
+ {"Aux Input", NULL, "AUX"},
};
static int wm8974_add_widgets(struct snd_soc_codec *codec)
}
struct pll_ {
- unsigned int in_hz, out_hz;
- unsigned int pre:4; /* prescale - 1 */
+ unsigned int pre_div:4; /* prescale - 1 */
unsigned int n:4;
unsigned int k;
};
-static struct pll_ pll[] = {
- { 12000000, 11289600, 0, 7, 0x86c220 },
- { 12000000, 12288000, 0, 8, 0x3126e8 },
- { 13000000, 11289600, 0, 6, 0xf28bd4 },
- { 13000000, 12288000, 0, 7, 0x8fd525 },
- { 12288000, 11289600, 0, 7, 0x59999a },
- { 11289600, 12288000, 0, 8, 0x80dee9 },
- { 25000000, 11289600, 1, 7, 0x39B024 },
- { 25000000, 24576000, 1, 7, 0xdd4413 }
-};
+static struct pll_ pll_div;
+
+/* The size in bits of the pll divide multiplied by 10
+ * to allow rounding later */
+#define FIXED_PLL_SIZE ((1 << 24) * 10)
+
+static void pll_factors(unsigned int target, unsigned int source)
+{
+ unsigned long long Kpart;
+ unsigned int K, Ndiv, Nmod;
+
+ Ndiv = target / source;
+ if (Ndiv < 6) {
+ source >>= 1;
+ pll_div.pre_div = 1;
+ Ndiv = target / source;
+ } else
+ pll_div.pre_div = 0;
+
+ if ((Ndiv < 6) || (Ndiv > 12))
+ printk(KERN_WARNING
+ "WM8974 N value %u outwith recommended range!\n",
+ Ndiv);
+
+ pll_div.n = Ndiv;
+ Nmod = target % source;
+ Kpart = FIXED_PLL_SIZE * (long long)Nmod;
+
+ do_div(Kpart, source);
+
+ K = Kpart & 0xFFFFFFFF;
+
+ /* Check if we need to round */
+ if ((K % 10) >= 5)
+ K += 5;
+
+ /* Move down to proper range now rounding is done */
+ K /= 10;
+
+ pll_div.k = K;
+}
static int wm8974_set_dai_pll(struct snd_soc_dai *codec_dai,
int pll_id, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
- int i;
u16 reg;
if (freq_in == 0 || freq_out == 0) {
- reg = wm8974_read_reg_cache(codec, WM8974_POWER1);
- wm8974_write(codec, WM8974_POWER1, reg & 0x1df);
+ /* Clock CODEC directly from MCLK */
+ reg = snd_soc_read(codec, WM8974_CLOCK);
+ snd_soc_write(codec, WM8974_CLOCK, reg & 0x0ff);
+
+ /* Turn off PLL */
+ reg = snd_soc_read(codec, WM8974_POWER1);
+ snd_soc_write(codec, WM8974_POWER1, reg & 0x1df);
return 0;
}
- for (i = 0; i < ARRAY_SIZE(pll); i++) {
- if (freq_in == pll[i].in_hz && freq_out == pll[i].out_hz) {
- wm8974_write(codec, WM8974_PLLN,
- (pll[i].pre << 4) | pll[i].n);
- wm8974_write(codec, WM8974_PLLK1, pll[i].k >> 18);
- wm8974_write(codec, WM8974_PLLK2,
- (pll[i].k >> 9) & 0x1ff);
- wm8974_write(codec, WM8974_PLLK3, pll[i].k & 0x1ff);
- reg = wm8974_read_reg_cache(codec, WM8974_POWER1);
- wm8974_write(codec, WM8974_POWER1, reg | 0x020);
- return 0;
- }
- }
+ pll_factors(freq_out*4, freq_in);
+
+ snd_soc_write(codec, WM8974_PLLN, (pll_div.pre_div << 4) | pll_div.n);
+ snd_soc_write(codec, WM8974_PLLK1, pll_div.k >> 18);
+ snd_soc_write(codec, WM8974_PLLK2, (pll_div.k >> 9) & 0x1ff);
+ snd_soc_write(codec, WM8974_PLLK3, pll_div.k & 0x1ff);
+ reg = snd_soc_read(codec, WM8974_POWER1);
+ snd_soc_write(codec, WM8974_POWER1, reg | 0x020);
+
+ /* Run CODEC from PLL instead of MCLK */
+ reg = snd_soc_read(codec, WM8974_CLOCK);
+ snd_soc_write(codec, WM8974_CLOCK, reg | 0x100);
- return -EINVAL;
+ return 0;
}
/*
switch (div_id) {
case WM8974_OPCLKDIV:
- reg = wm8974_read_reg_cache(codec, WM8974_GPIO) & 0x1cf;
- wm8974_write(codec, WM8974_GPIO, reg | div);
+ reg = snd_soc_read(codec, WM8974_GPIO) & 0x1cf;
+ snd_soc_write(codec, WM8974_GPIO, reg | div);
break;
case WM8974_MCLKDIV:
- reg = wm8974_read_reg_cache(codec, WM8974_CLOCK) & 0x11f;
- wm8974_write(codec, WM8974_CLOCK, reg | div);
+ reg = snd_soc_read(codec, WM8974_CLOCK) & 0x11f;
+ snd_soc_write(codec, WM8974_CLOCK, reg | div);
break;
case WM8974_ADCCLK:
- reg = wm8974_read_reg_cache(codec, WM8974_ADC) & 0x1f7;
- wm8974_write(codec, WM8974_ADC, reg | div);
+ reg = snd_soc_read(codec, WM8974_ADC) & 0x1f7;
+ snd_soc_write(codec, WM8974_ADC, reg | div);
break;
case WM8974_DACCLK:
- reg = wm8974_read_reg_cache(codec, WM8974_DAC) & 0x1f7;
- wm8974_write(codec, WM8974_DAC, reg | div);
+ reg = snd_soc_read(codec, WM8974_DAC) & 0x1f7;
+ snd_soc_write(codec, WM8974_DAC, reg | div);
break;
case WM8974_BCLKDIV:
- reg = wm8974_read_reg_cache(codec, WM8974_CLOCK) & 0x1e3;
- wm8974_write(codec, WM8974_CLOCK, reg | div);
+ reg = snd_soc_read(codec, WM8974_CLOCK) & 0x1e3;
+ snd_soc_write(codec, WM8974_CLOCK, reg | div);
break;
default:
return -EINVAL;
{
struct snd_soc_codec *codec = codec_dai->codec;
u16 iface = 0;
- u16 clk = wm8974_read_reg_cache(codec, WM8974_CLOCK) & 0x1fe;
+ u16 clk = snd_soc_read(codec, WM8974_CLOCK) & 0x1fe;
/* set master/slave audio interface */
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
return -EINVAL;
}
- wm8974_write(codec, WM8974_IFACE, iface);
- wm8974_write(codec, WM8974_CLOCK, clk);
+ snd_soc_write(codec, WM8974_IFACE, iface);
+ snd_soc_write(codec, WM8974_CLOCK, clk);
return 0;
}
struct snd_soc_dai *dai)
{
struct snd_soc_codec *codec = dai->codec;
- u16 iface = wm8974_read_reg_cache(codec, WM8974_IFACE) & 0x19f;
- u16 adn = wm8974_read_reg_cache(codec, WM8974_ADD) & 0x1f1;
+ u16 iface = snd_soc_read(codec, WM8974_IFACE) & 0x19f;
+ u16 adn = snd_soc_read(codec, WM8974_ADD) & 0x1f1;
/* bit size */
switch (params_format(params)) {
adn |= 0x1 << 1;
break;
case SNDRV_PCM_RATE_44100:
+ case SNDRV_PCM_RATE_48000:
break;
}
- wm8974_write(codec, WM8974_IFACE, iface);
- wm8974_write(codec, WM8974_ADD, adn);
+ snd_soc_write(codec, WM8974_IFACE, iface);
+ snd_soc_write(codec, WM8974_ADD, adn);
return 0;
}
static int wm8974_mute(struct snd_soc_dai *dai, int mute)
{
struct snd_soc_codec *codec = dai->codec;
- u16 mute_reg = wm8974_read_reg_cache(codec, WM8974_DAC) & 0xffbf;
+ u16 mute_reg = snd_soc_read(codec, WM8974_DAC) & 0xffbf;
if (mute)
- wm8974_write(codec, WM8974_DAC, mute_reg | 0x40);
+ snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40);
else
- wm8974_write(codec, WM8974_DAC, mute_reg);
+ snd_soc_write(codec, WM8974_DAC, mute_reg);
return 0;
}
static int wm8974_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
- u16 power1 = wm8974_read_reg_cache(codec, WM8974_POWER1) & ~0x3;
+ u16 power1 = snd_soc_read(codec, WM8974_POWER1) & ~0x3;
switch (level) {
case SND_SOC_BIAS_ON:
case SND_SOC_BIAS_PREPARE:
power1 |= 0x1; /* VMID 50k */
- wm8974_write(codec, WM8974_POWER1, power1);
+ snd_soc_write(codec, WM8974_POWER1, power1);
break;
case SND_SOC_BIAS_STANDBY:
if (codec->bias_level == SND_SOC_BIAS_OFF) {
/* Initial cap charge at VMID 5k */
- wm8974_write(codec, WM8974_POWER1, power1 | 0x3);
+ snd_soc_write(codec, WM8974_POWER1, power1 | 0x3);
mdelay(100);
}
power1 |= 0x2; /* VMID 500k */
- wm8974_write(codec, WM8974_POWER1, power1);
+ snd_soc_write(codec, WM8974_POWER1, power1);
break;
case SND_SOC_BIAS_OFF:
- wm8974_write(codec, WM8974_POWER1, 0);
- wm8974_write(codec, WM8974_POWER2, 0);
- wm8974_write(codec, WM8974_POWER3, 0);
+ snd_soc_write(codec, WM8974_POWER1, 0);
+ snd_soc_write(codec, WM8974_POWER2, 0);
+ snd_soc_write(codec, WM8974_POWER3, 0);
break;
}
.playback = {
.stream_name = "Playback",
.channels_min = 1,
- .channels_max = 1,
+ .channels_max = 2, /* Only 1 channel of data */
.rates = WM8974_RATES,
.formats = WM8974_FORMATS,},
.capture = {
.stream_name = "Capture",
.channels_min = 1,
- .channels_max = 1,
+ .channels_max = 2, /* Only 1 channel of data */
.rates = WM8974_RATES,
.formats = WM8974_FORMATS,},
.ops = &wm8974_ops,
+ .symmetric_rates = 1,
};
EXPORT_SYMBOL_GPL(wm8974_dai);
codec->private_data = wm8974;
codec->name = "WM8974";
codec->owner = THIS_MODULE;
- codec->read = wm8974_read_reg_cache;
- codec->write = wm8974_write;
codec->bias_level = SND_SOC_BIAS_OFF;
codec->set_bias_level = wm8974_set_bias_level;
codec->dai = &wm8974_dai;
codec->reg_cache_size = WM8974_CACHEREGNUM;
codec->reg_cache = &wm8974->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, wm8974_reg, sizeof(wm8974_reg));
ret = wm8974_reset(codec);
if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset\n");
- return ret;
+ goto err;
}
wm8974_dai.dev = codec->dev;
ret = snd_soc_register_codec(codec);
if (ret != 0) {
dev_err(codec->dev, "Failed to register codec: %d\n", ret);
- return ret;
+ goto err;
}
ret = snd_soc_register_dai(&wm8974_dai);
if (ret != 0) {
dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
- snd_soc_unregister_codec(codec);
- return ret;
+ goto err_codec;
}
return 0;
+
+err_codec:
+ snd_soc_unregister_codec(codec);
+err:
+ kfree(wm8974);
+ return ret;
}
static __devexit void wm8974_unregister(struct wm8974_priv *wm8974)
static struct i2c_driver wm8974_i2c_driver = {
.driver = {
- .name = "WM8974 I2C Codec",
+ .name = "WM8974",
.owner = THIS_MODULE,
},
.probe = wm8974_i2c_probe,