mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8961', 'asoc/topic/wm8962', 'asoc/topic/wm8971' and 'asoc/topic/wm8974' into asoc-next
This commit is contained in:
commit
0d1b2881d7
7 changed files with 564 additions and 582 deletions
|
@ -49,7 +49,7 @@
|
|||
#define WM8960_DRES_MASK 0x30
|
||||
|
||||
static bool is_pll_freq_available(unsigned int source, unsigned int target);
|
||||
static int wm8960_set_pll(struct snd_soc_codec *codec,
|
||||
static int wm8960_set_pll(struct snd_soc_component *component,
|
||||
unsigned int freq_in, unsigned int freq_out);
|
||||
/*
|
||||
* wm8960 register cache
|
||||
|
@ -123,7 +123,7 @@ static bool wm8960_volatile(struct device *dev, unsigned int reg)
|
|||
struct wm8960_priv {
|
||||
struct clk *mclk;
|
||||
struct regmap *regmap;
|
||||
int (*set_bias_level)(struct snd_soc_codec *,
|
||||
int (*set_bias_level)(struct snd_soc_component *,
|
||||
enum snd_soc_bias_level level);
|
||||
struct snd_soc_dapm_widget *lout1;
|
||||
struct snd_soc_dapm_widget *rout1;
|
||||
|
@ -168,9 +168,9 @@ static const struct soc_enum wm8960_enum[] = {
|
|||
|
||||
static const int deemph_settings[] = { 0, 32000, 44100, 48000 };
|
||||
|
||||
static int wm8960_set_deemph(struct snd_soc_codec *codec)
|
||||
static int wm8960_set_deemph(struct snd_soc_component *component)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
int val, i, best;
|
||||
|
||||
/* If we're using deemphasis select the nearest available sample
|
||||
|
@ -189,17 +189,17 @@ static int wm8960_set_deemph(struct snd_soc_codec *codec)
|
|||
val = 0;
|
||||
}
|
||||
|
||||
dev_dbg(codec->dev, "Set deemphasis %d\n", val);
|
||||
dev_dbg(component->dev, "Set deemphasis %d\n", val);
|
||||
|
||||
return snd_soc_update_bits(codec, WM8960_DACCTL1,
|
||||
return snd_soc_component_update_bits(component, WM8960_DACCTL1,
|
||||
0x6, val);
|
||||
}
|
||||
|
||||
static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
ucontrol->value.integer.value[0] = wm8960->deemph;
|
||||
return 0;
|
||||
|
@ -208,8 +208,8 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
|
|||
static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
unsigned int deemph = ucontrol->value.integer.value[0];
|
||||
|
||||
if (deemph > 1)
|
||||
|
@ -217,7 +217,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
|
|||
|
||||
wm8960->deemph = deemph;
|
||||
|
||||
return wm8960_set_deemph(codec);
|
||||
return wm8960_set_deemph(component);
|
||||
}
|
||||
|
||||
static const DECLARE_TLV_DB_SCALE(adc_tlv, -9750, 50, 1);
|
||||
|
@ -470,11 +470,11 @@ static const struct snd_soc_dapm_route audio_paths_capless[] = {
|
|||
{ "OUT3 VMID", NULL, "Right Output Mixer" },
|
||||
};
|
||||
|
||||
static int wm8960_add_widgets(struct snd_soc_codec *codec)
|
||||
static int wm8960_add_widgets(struct snd_soc_component *component)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
struct wm8960_data *pdata = &wm8960->pdata;
|
||||
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
|
||||
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
|
||||
struct snd_soc_dapm_widget *w;
|
||||
|
||||
snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets,
|
||||
|
@ -504,7 +504,7 @@ static int wm8960_add_widgets(struct snd_soc_codec *codec)
|
|||
* list each time to find the desired power state do so now
|
||||
* and save the result.
|
||||
*/
|
||||
list_for_each_entry(w, &codec->component.card->widgets, list) {
|
||||
list_for_each_entry(w, &component->card->widgets, list) {
|
||||
if (w->dapm != dapm)
|
||||
continue;
|
||||
if (strcmp(w->name, "LOUT1 PGA") == 0)
|
||||
|
@ -521,7 +521,7 @@ static int wm8960_add_widgets(struct snd_soc_codec *codec)
|
|||
static int wm8960_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
||||
unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
u16 iface = 0;
|
||||
|
||||
/* set master/slave audio interface */
|
||||
|
@ -573,7 +573,7 @@ static int wm8960_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|||
}
|
||||
|
||||
/* set iface */
|
||||
snd_soc_write(codec, WM8960_IFACE1, iface);
|
||||
snd_soc_component_write(component, WM8960_IFACE1, iface);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -683,7 +683,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
|
|||
* triplet, we relax the bclk such that bclk is chosen as the
|
||||
* closest available frequency greater than expected bclk.
|
||||
*
|
||||
* @codec: codec structure
|
||||
* @component: component structure
|
||||
* @freq_in: input frequency used to derive freq out via PLL
|
||||
* @sysclk_idx: sysclk_divs index for found sysclk
|
||||
* @dac_idx: dac_divs index for found lrclk
|
||||
|
@ -695,10 +695,10 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
|
|||
* (@sysclk_idx, @dac_idx, @bclk_idx) dividers
|
||||
*/
|
||||
static
|
||||
int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
|
||||
int wm8960_configure_pll(struct snd_soc_component *component, int freq_in,
|
||||
int *sysclk_idx, int *dac_idx, int *bclk_idx)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
int sysclk, bclk, lrclk, freq_out;
|
||||
int diff, closest, best_freq_out;
|
||||
int i, j, k;
|
||||
|
@ -741,22 +741,22 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
|
|||
|
||||
return best_freq_out;
|
||||
}
|
||||
static int wm8960_configure_clocking(struct snd_soc_codec *codec)
|
||||
static int wm8960_configure_clocking(struct snd_soc_component *component)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
int freq_out, freq_in;
|
||||
u16 iface1 = snd_soc_read(codec, WM8960_IFACE1);
|
||||
u16 iface1 = snd_soc_component_read32(component, WM8960_IFACE1);
|
||||
int i, j, k;
|
||||
int ret;
|
||||
|
||||
if (!(iface1 & (1<<6))) {
|
||||
dev_dbg(codec->dev,
|
||||
dev_dbg(component->dev,
|
||||
"Codec is slave mode, no need to configure clock\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (wm8960->clk_id != WM8960_SYSCLK_MCLK && !wm8960->freq_in) {
|
||||
dev_err(codec->dev, "No MCLK configured\n");
|
||||
dev_err(component->dev, "No MCLK configured\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -769,12 +769,12 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
|
|||
*/
|
||||
if (wm8960->clk_id == WM8960_SYSCLK_AUTO) {
|
||||
/* disable the PLL and using MCLK to provide sysclk */
|
||||
wm8960_set_pll(codec, 0, 0);
|
||||
wm8960_set_pll(component, 0, 0);
|
||||
freq_out = freq_in;
|
||||
} else if (wm8960->sysclk) {
|
||||
freq_out = wm8960->sysclk;
|
||||
} else {
|
||||
dev_err(codec->dev, "No SYSCLK configured\n");
|
||||
dev_err(component->dev, "No SYSCLK configured\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -783,28 +783,28 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
|
|||
if (ret >= 0) {
|
||||
goto configure_clock;
|
||||
} else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) {
|
||||
dev_err(codec->dev, "failed to configure clock\n");
|
||||
dev_err(component->dev, "failed to configure clock\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
freq_out = wm8960_configure_pll(codec, freq_in, &i, &j, &k);
|
||||
freq_out = wm8960_configure_pll(component, freq_in, &i, &j, &k);
|
||||
if (freq_out < 0) {
|
||||
dev_err(codec->dev, "failed to configure clock via PLL\n");
|
||||
dev_err(component->dev, "failed to configure clock via PLL\n");
|
||||
return freq_out;
|
||||
}
|
||||
wm8960_set_pll(codec, freq_in, freq_out);
|
||||
wm8960_set_pll(component, freq_in, freq_out);
|
||||
|
||||
configure_clock:
|
||||
/* configure sysclk clock */
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1, 3 << 1, i << 1);
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1, 3 << 1, i << 1);
|
||||
|
||||
/* configure frame clock */
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x7 << 3, j << 3);
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x7 << 6, j << 6);
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x7 << 3, j << 3);
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x7 << 6, j << 6);
|
||||
|
||||
/* configure bit clock */
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK2, 0xf, k);
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK2, 0xf, k);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -813,9 +813,9 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 iface = snd_soc_read(codec, WM8960_IFACE1) & 0xfff3;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
u16 iface = snd_soc_component_read32(component, WM8960_IFACE1) & 0xfff3;
|
||||
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
|
||||
int i;
|
||||
|
||||
|
@ -840,7 +840,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
|
|||
break;
|
||||
}
|
||||
default:
|
||||
dev_err(codec->dev, "unsupported width %d\n",
|
||||
dev_err(component->dev, "unsupported width %d\n",
|
||||
params_width(params));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -848,23 +848,23 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
|
|||
wm8960->lrclk = params_rate(params);
|
||||
/* Update filters for the new rate */
|
||||
if (tx) {
|
||||
wm8960_set_deemph(codec);
|
||||
wm8960_set_deemph(component);
|
||||
} else {
|
||||
for (i = 0; i < ARRAY_SIZE(alc_rates); i++)
|
||||
if (alc_rates[i].rate == params_rate(params))
|
||||
snd_soc_update_bits(codec,
|
||||
snd_soc_component_update_bits(component,
|
||||
WM8960_ADDCTL3, 0x7,
|
||||
alc_rates[i].val);
|
||||
}
|
||||
|
||||
/* set iface */
|
||||
snd_soc_write(codec, WM8960_IFACE1, iface);
|
||||
snd_soc_component_write(component, WM8960_IFACE1, iface);
|
||||
|
||||
wm8960->is_stream_in_use[tx] = true;
|
||||
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON &&
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON &&
|
||||
!wm8960->is_stream_in_use[!tx])
|
||||
return wm8960_configure_clocking(codec);
|
||||
return wm8960_configure_clocking(component);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -872,8 +872,8 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
|
|||
static int wm8960_hw_free(struct snd_pcm_substream *substream,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
|
||||
|
||||
wm8960->is_stream_in_use[tx] = false;
|
||||
|
@ -883,20 +883,20 @@ static int wm8960_hw_free(struct snd_pcm_substream *substream,
|
|||
|
||||
static int wm8960_mute(struct snd_soc_dai *dai, int mute)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
|
||||
if (mute)
|
||||
snd_soc_update_bits(codec, WM8960_DACCTL1, 0x8, 0x8);
|
||||
snd_soc_component_update_bits(component, WM8960_DACCTL1, 0x8, 0x8);
|
||||
else
|
||||
snd_soc_update_bits(codec, WM8960_DACCTL1, 0x8, 0);
|
||||
snd_soc_component_update_bits(component, WM8960_DACCTL1, 0x8, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
|
||||
static int wm8960_set_bias_level_out3(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 pm2 = snd_soc_read(codec, WM8960_POWER2);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
u16 pm2 = snd_soc_component_read32(component, WM8960_POWER2);
|
||||
int ret;
|
||||
|
||||
switch (level) {
|
||||
|
@ -904,24 +904,24 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
|
|||
break;
|
||||
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
switch (snd_soc_codec_get_bias_level(codec)) {
|
||||
switch (snd_soc_component_get_bias_level(component)) {
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (!IS_ERR(wm8960->mclk)) {
|
||||
ret = clk_prepare_enable(wm8960->mclk);
|
||||
if (ret) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"Failed to enable MCLK: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
ret = wm8960_configure_clocking(codec);
|
||||
ret = wm8960_configure_clocking(component);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* Set VMID to 2x50k */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x80);
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1, 0x180, 0x80);
|
||||
break;
|
||||
|
||||
case SND_SOC_BIAS_ON:
|
||||
|
@ -930,7 +930,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
|
|||
* disable the pll
|
||||
*/
|
||||
if (wm8960->clk_id == WM8960_SYSCLK_AUTO && (pm2 & 0x1))
|
||||
wm8960_set_pll(codec, 0, 0);
|
||||
wm8960_set_pll(component, 0, 0);
|
||||
|
||||
if (!IS_ERR(wm8960->mclk))
|
||||
clk_disable_unprepare(wm8960->mclk);
|
||||
|
@ -943,38 +943,38 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
|
|||
break;
|
||||
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
|
||||
regcache_sync(wm8960->regmap);
|
||||
|
||||
/* Enable anti-pop features */
|
||||
snd_soc_write(codec, WM8960_APOP1,
|
||||
snd_soc_component_write(component, WM8960_APOP1,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
WM8960_BUFDCOPEN | WM8960_BUFIOEN);
|
||||
|
||||
/* Enable & ramp VMID at 2x50k */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1, 0x80, 0x80);
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1, 0x80, 0x80);
|
||||
msleep(100);
|
||||
|
||||
/* Enable VREF */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1, WM8960_VREF,
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1, WM8960_VREF,
|
||||
WM8960_VREF);
|
||||
|
||||
/* Disable anti-pop features */
|
||||
snd_soc_write(codec, WM8960_APOP1, WM8960_BUFIOEN);
|
||||
snd_soc_component_write(component, WM8960_APOP1, WM8960_BUFIOEN);
|
||||
}
|
||||
|
||||
/* Set VMID to 2x250k */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x100);
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1, 0x180, 0x100);
|
||||
break;
|
||||
|
||||
case SND_SOC_BIAS_OFF:
|
||||
/* Enable anti-pop features */
|
||||
snd_soc_write(codec, WM8960_APOP1,
|
||||
snd_soc_component_write(component, WM8960_APOP1,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
WM8960_BUFDCOPEN | WM8960_BUFIOEN);
|
||||
|
||||
/* Disable VMID and VREF, let them discharge */
|
||||
snd_soc_write(codec, WM8960_POWER1, 0);
|
||||
snd_soc_component_write(component, WM8960_POWER1, 0);
|
||||
msleep(600);
|
||||
break;
|
||||
}
|
||||
|
@ -982,11 +982,11 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
|
||||
static int wm8960_set_bias_level_capless(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 pm2 = snd_soc_read(codec, WM8960_POWER2);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
u16 pm2 = snd_soc_component_read32(component, WM8960_POWER2);
|
||||
int reg, ret;
|
||||
|
||||
switch (level) {
|
||||
|
@ -994,10 +994,10 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
|
|||
break;
|
||||
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
switch (snd_soc_codec_get_bias_level(codec)) {
|
||||
switch (snd_soc_component_get_bias_level(component)) {
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
/* Enable anti pop mode */
|
||||
snd_soc_update_bits(codec, WM8960_APOP1,
|
||||
snd_soc_component_update_bits(component, WM8960_APOP1,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
WM8960_BUFDCOPEN,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
|
@ -1011,20 +1011,20 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
|
|||
reg |= WM8960_PWR2_ROUT1;
|
||||
if (wm8960->out3 && wm8960->out3->power)
|
||||
reg |= WM8960_PWR2_OUT3;
|
||||
snd_soc_update_bits(codec, WM8960_POWER2,
|
||||
snd_soc_component_update_bits(component, WM8960_POWER2,
|
||||
WM8960_PWR2_LOUT1 |
|
||||
WM8960_PWR2_ROUT1 |
|
||||
WM8960_PWR2_OUT3, reg);
|
||||
|
||||
/* Enable VMID at 2*50k */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1,
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1,
|
||||
WM8960_VMID_MASK, 0x80);
|
||||
|
||||
/* Ramp */
|
||||
msleep(100);
|
||||
|
||||
/* Enable VREF */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1,
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1,
|
||||
WM8960_VREF, WM8960_VREF);
|
||||
|
||||
msleep(100);
|
||||
|
@ -1032,14 +1032,14 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
|
|||
if (!IS_ERR(wm8960->mclk)) {
|
||||
ret = clk_prepare_enable(wm8960->mclk);
|
||||
if (ret) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"Failed to enable MCLK: %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
ret = wm8960_configure_clocking(codec);
|
||||
ret = wm8960_configure_clocking(component);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -1051,20 +1051,20 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
|
|||
* disable the pll
|
||||
*/
|
||||
if (wm8960->clk_id == WM8960_SYSCLK_AUTO && (pm2 & 0x1))
|
||||
wm8960_set_pll(codec, 0, 0);
|
||||
wm8960_set_pll(component, 0, 0);
|
||||
|
||||
if (!IS_ERR(wm8960->mclk))
|
||||
clk_disable_unprepare(wm8960->mclk);
|
||||
|
||||
/* Enable anti-pop mode */
|
||||
snd_soc_update_bits(codec, WM8960_APOP1,
|
||||
snd_soc_component_update_bits(component, WM8960_APOP1,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
WM8960_BUFDCOPEN,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
WM8960_BUFDCOPEN);
|
||||
|
||||
/* Disable VMID and VREF */
|
||||
snd_soc_update_bits(codec, WM8960_POWER1,
|
||||
snd_soc_component_update_bits(component, WM8960_POWER1,
|
||||
WM8960_VREF | WM8960_VMID_MASK, 0);
|
||||
break;
|
||||
|
||||
|
@ -1077,15 +1077,15 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
|
|||
break;
|
||||
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
switch (snd_soc_codec_get_bias_level(codec)) {
|
||||
switch (snd_soc_component_get_bias_level(component)) {
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
/* Disable HP discharge */
|
||||
snd_soc_update_bits(codec, WM8960_APOP2,
|
||||
snd_soc_component_update_bits(component, WM8960_APOP2,
|
||||
WM8960_DISOP | WM8960_DRES_MASK,
|
||||
0);
|
||||
|
||||
/* Disable anti-pop features */
|
||||
snd_soc_update_bits(codec, WM8960_APOP1,
|
||||
snd_soc_component_update_bits(component, WM8960_APOP1,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
WM8960_BUFDCOPEN,
|
||||
WM8960_POBCTRL | WM8960_SOFT_ST |
|
||||
|
@ -1184,7 +1184,7 @@ static int pll_factors(unsigned int source, unsigned int target,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int wm8960_set_pll(struct snd_soc_codec *codec,
|
||||
static int wm8960_set_pll(struct snd_soc_component *component,
|
||||
unsigned int freq_in, unsigned int freq_out)
|
||||
{
|
||||
u16 reg;
|
||||
|
@ -1199,29 +1199,29 @@ static int wm8960_set_pll(struct snd_soc_codec *codec,
|
|||
|
||||
/* Disable the PLL: even if we are changing the frequency the
|
||||
* PLL needs to be disabled while we do so. */
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x1, 0);
|
||||
snd_soc_update_bits(codec, WM8960_POWER2, 0x1, 0);
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x1, 0);
|
||||
snd_soc_component_update_bits(component, WM8960_POWER2, 0x1, 0);
|
||||
|
||||
if (!freq_in || !freq_out)
|
||||
return 0;
|
||||
|
||||
reg = snd_soc_read(codec, WM8960_PLL1) & ~0x3f;
|
||||
reg = snd_soc_component_read32(component, WM8960_PLL1) & ~0x3f;
|
||||
reg |= pll_div.pre_div << 4;
|
||||
reg |= pll_div.n;
|
||||
|
||||
if (pll_div.k) {
|
||||
reg |= 0x20;
|
||||
|
||||
snd_soc_write(codec, WM8960_PLL2, (pll_div.k >> 16) & 0xff);
|
||||
snd_soc_write(codec, WM8960_PLL3, (pll_div.k >> 8) & 0xff);
|
||||
snd_soc_write(codec, WM8960_PLL4, pll_div.k & 0xff);
|
||||
snd_soc_component_write(component, WM8960_PLL2, (pll_div.k >> 16) & 0xff);
|
||||
snd_soc_component_write(component, WM8960_PLL3, (pll_div.k >> 8) & 0xff);
|
||||
snd_soc_component_write(component, WM8960_PLL4, pll_div.k & 0xff);
|
||||
}
|
||||
snd_soc_write(codec, WM8960_PLL1, reg);
|
||||
snd_soc_component_write(component, WM8960_PLL1, reg);
|
||||
|
||||
/* Turn it on */
|
||||
snd_soc_update_bits(codec, WM8960_POWER2, 0x1, 0x1);
|
||||
snd_soc_component_update_bits(component, WM8960_POWER2, 0x1, 0x1);
|
||||
msleep(250);
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x1, 0x1);
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x1, 0x1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1229,43 +1229,43 @@ static int wm8960_set_pll(struct snd_soc_codec *codec,
|
|||
static int wm8960_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 wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
wm8960->freq_in = freq_in;
|
||||
|
||||
if (pll_id == WM8960_SYSCLK_AUTO)
|
||||
return 0;
|
||||
|
||||
return wm8960_set_pll(codec, freq_in, freq_out);
|
||||
return wm8960_set_pll(component, freq_in, freq_out);
|
||||
}
|
||||
|
||||
static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
|
||||
int div_id, int div)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
u16 reg;
|
||||
|
||||
switch (div_id) {
|
||||
case WM8960_SYSCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1f9;
|
||||
snd_soc_write(codec, WM8960_CLOCK1, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8960_CLOCK1) & 0x1f9;
|
||||
snd_soc_component_write(component, WM8960_CLOCK1, reg | div);
|
||||
break;
|
||||
case WM8960_DACDIV:
|
||||
reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1c7;
|
||||
snd_soc_write(codec, WM8960_CLOCK1, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8960_CLOCK1) & 0x1c7;
|
||||
snd_soc_component_write(component, WM8960_CLOCK1, reg | div);
|
||||
break;
|
||||
case WM8960_OPCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8960_PLL1) & 0x03f;
|
||||
snd_soc_write(codec, WM8960_PLL1, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8960_PLL1) & 0x03f;
|
||||
snd_soc_component_write(component, WM8960_PLL1, reg | div);
|
||||
break;
|
||||
case WM8960_DCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8960_CLOCK2) & 0x03f;
|
||||
snd_soc_write(codec, WM8960_CLOCK2, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8960_CLOCK2) & 0x03f;
|
||||
snd_soc_component_write(component, WM8960_CLOCK2, reg | div);
|
||||
break;
|
||||
case WM8960_TOCLKSEL:
|
||||
reg = snd_soc_read(codec, WM8960_ADDCTL1) & 0x1fd;
|
||||
snd_soc_write(codec, WM8960_ADDCTL1, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8960_ADDCTL1) & 0x1fd;
|
||||
snd_soc_component_write(component, WM8960_ADDCTL1, reg | div);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
|
@ -1274,27 +1274,27 @@ static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int wm8960_set_bias_level(struct snd_soc_codec *codec,
|
||||
static int wm8960_set_bias_level(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
return wm8960->set_bias_level(codec, level);
|
||||
return wm8960->set_bias_level(component, level);
|
||||
}
|
||||
|
||||
static int wm8960_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
|
||||
unsigned int freq, int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
switch (clk_id) {
|
||||
case WM8960_SYSCLK_MCLK:
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1,
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1,
|
||||
0x1, WM8960_SYSCLK_MCLK);
|
||||
break;
|
||||
case WM8960_SYSCLK_PLL:
|
||||
snd_soc_update_bits(codec, WM8960_CLOCK1,
|
||||
snd_soc_component_update_bits(component, WM8960_CLOCK1,
|
||||
0x1, WM8960_SYSCLK_PLL);
|
||||
break;
|
||||
case WM8960_SYSCLK_AUTO:
|
||||
|
@ -1343,9 +1343,9 @@ static struct snd_soc_dai_driver wm8960_dai = {
|
|||
.symmetric_rates = 1,
|
||||
};
|
||||
|
||||
static int wm8960_probe(struct snd_soc_codec *codec)
|
||||
static int wm8960_probe(struct snd_soc_component *component)
|
||||
{
|
||||
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
|
||||
struct wm8960_data *pdata = &wm8960->pdata;
|
||||
|
||||
if (pdata->capless)
|
||||
|
@ -1353,17 +1353,21 @@ static int wm8960_probe(struct snd_soc_codec *codec)
|
|||
else
|
||||
wm8960->set_bias_level = wm8960_set_bias_level_out3;
|
||||
|
||||
snd_soc_add_codec_controls(codec, wm8960_snd_controls,
|
||||
snd_soc_add_component_controls(component, wm8960_snd_controls,
|
||||
ARRAY_SIZE(wm8960_snd_controls));
|
||||
wm8960_add_widgets(codec);
|
||||
wm8960_add_widgets(component);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8960 = {
|
||||
.probe = wm8960_probe,
|
||||
.set_bias_level = wm8960_set_bias_level,
|
||||
.suspend_bias_off = true,
|
||||
static const struct snd_soc_component_driver soc_component_dev_wm8960 = {
|
||||
.probe = wm8960_probe,
|
||||
.set_bias_level = wm8960_set_bias_level,
|
||||
.suspend_bias_off = 1,
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static const struct regmap_config wm8960_regmap = {
|
||||
|
@ -1447,15 +1451,14 @@ static int wm8960_i2c_probe(struct i2c_client *i2c,
|
|||
|
||||
i2c_set_clientdata(i2c, wm8960);
|
||||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_wm8960, &wm8960_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_wm8960, &wm8960_dai, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wm8960_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -194,89 +194,89 @@ static bool wm8961_readable(struct device *dev, unsigned int reg)
|
|||
static int wm8961_hp_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *kcontrol, int event)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
|
||||
u16 hp_reg = snd_soc_read(codec, WM8961_ANALOGUE_HP_0);
|
||||
u16 cp_reg = snd_soc_read(codec, WM8961_CHARGE_PUMP_1);
|
||||
u16 pwr_reg = snd_soc_read(codec, WM8961_PWR_MGMT_2);
|
||||
u16 dcs_reg = snd_soc_read(codec, WM8961_DC_SERVO_1);
|
||||
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
|
||||
u16 hp_reg = snd_soc_component_read32(component, WM8961_ANALOGUE_HP_0);
|
||||
u16 cp_reg = snd_soc_component_read32(component, WM8961_CHARGE_PUMP_1);
|
||||
u16 pwr_reg = snd_soc_component_read32(component, WM8961_PWR_MGMT_2);
|
||||
u16 dcs_reg = snd_soc_component_read32(component, WM8961_DC_SERVO_1);
|
||||
int timeout = 500;
|
||||
|
||||
if (event & SND_SOC_DAPM_POST_PMU) {
|
||||
/* Make sure the output is shorted */
|
||||
hp_reg &= ~(WM8961_HPR_RMV_SHORT | WM8961_HPL_RMV_SHORT);
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Enable the charge pump */
|
||||
cp_reg |= WM8961_CP_ENA;
|
||||
snd_soc_write(codec, WM8961_CHARGE_PUMP_1, cp_reg);
|
||||
snd_soc_component_write(component, WM8961_CHARGE_PUMP_1, cp_reg);
|
||||
mdelay(5);
|
||||
|
||||
/* Enable the PGA */
|
||||
pwr_reg |= WM8961_LOUT1_PGA | WM8961_ROUT1_PGA;
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
|
||||
/* Enable the amplifier */
|
||||
hp_reg |= WM8961_HPR_ENA | WM8961_HPL_ENA;
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Second stage enable */
|
||||
hp_reg |= WM8961_HPR_ENA_DLY | WM8961_HPL_ENA_DLY;
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Enable the DC servo & trigger startup */
|
||||
dcs_reg |=
|
||||
WM8961_DCS_ENA_CHAN_HPR | WM8961_DCS_TRIG_STARTUP_HPR |
|
||||
WM8961_DCS_ENA_CHAN_HPL | WM8961_DCS_TRIG_STARTUP_HPL;
|
||||
dev_dbg(codec->dev, "Enabling DC servo\n");
|
||||
dev_dbg(component->dev, "Enabling DC servo\n");
|
||||
|
||||
snd_soc_write(codec, WM8961_DC_SERVO_1, dcs_reg);
|
||||
snd_soc_component_write(component, WM8961_DC_SERVO_1, dcs_reg);
|
||||
do {
|
||||
msleep(1);
|
||||
dcs_reg = snd_soc_read(codec, WM8961_DC_SERVO_1);
|
||||
dcs_reg = snd_soc_component_read32(component, WM8961_DC_SERVO_1);
|
||||
} while (--timeout &&
|
||||
dcs_reg & (WM8961_DCS_TRIG_STARTUP_HPR |
|
||||
WM8961_DCS_TRIG_STARTUP_HPL));
|
||||
if (dcs_reg & (WM8961_DCS_TRIG_STARTUP_HPR |
|
||||
WM8961_DCS_TRIG_STARTUP_HPL))
|
||||
dev_err(codec->dev, "DC servo timed out\n");
|
||||
dev_err(component->dev, "DC servo timed out\n");
|
||||
else
|
||||
dev_dbg(codec->dev, "DC servo startup complete\n");
|
||||
dev_dbg(component->dev, "DC servo startup complete\n");
|
||||
|
||||
/* Enable the output stage */
|
||||
hp_reg |= WM8961_HPR_ENA_OUTP | WM8961_HPL_ENA_OUTP;
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Remove the short on the output stage */
|
||||
hp_reg |= WM8961_HPR_RMV_SHORT | WM8961_HPL_RMV_SHORT;
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
}
|
||||
|
||||
if (event & SND_SOC_DAPM_PRE_PMD) {
|
||||
/* Short the output */
|
||||
hp_reg &= ~(WM8961_HPR_RMV_SHORT | WM8961_HPL_RMV_SHORT);
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Disable the output stage */
|
||||
hp_reg &= ~(WM8961_HPR_ENA_OUTP | WM8961_HPL_ENA_OUTP);
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Disable DC offset cancellation */
|
||||
dcs_reg &= ~(WM8961_DCS_ENA_CHAN_HPR |
|
||||
WM8961_DCS_ENA_CHAN_HPL);
|
||||
snd_soc_write(codec, WM8961_DC_SERVO_1, dcs_reg);
|
||||
snd_soc_component_write(component, WM8961_DC_SERVO_1, dcs_reg);
|
||||
|
||||
/* Finish up */
|
||||
hp_reg &= ~(WM8961_HPR_ENA_DLY | WM8961_HPR_ENA |
|
||||
WM8961_HPL_ENA_DLY | WM8961_HPL_ENA);
|
||||
snd_soc_write(codec, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
snd_soc_component_write(component, WM8961_ANALOGUE_HP_0, hp_reg);
|
||||
|
||||
/* Disable the PGA */
|
||||
pwr_reg &= ~(WM8961_LOUT1_PGA | WM8961_ROUT1_PGA);
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
|
||||
/* Disable the charge pump */
|
||||
dev_dbg(codec->dev, "Disabling charge pump\n");
|
||||
snd_soc_write(codec, WM8961_CHARGE_PUMP_1,
|
||||
dev_dbg(component->dev, "Disabling charge pump\n");
|
||||
snd_soc_component_write(component, WM8961_CHARGE_PUMP_1,
|
||||
cp_reg & ~WM8961_CP_ENA);
|
||||
}
|
||||
|
||||
|
@ -286,28 +286,28 @@ static int wm8961_hp_event(struct snd_soc_dapm_widget *w,
|
|||
static int wm8961_spk_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *kcontrol, int event)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
|
||||
u16 pwr_reg = snd_soc_read(codec, WM8961_PWR_MGMT_2);
|
||||
u16 spk_reg = snd_soc_read(codec, WM8961_CLASS_D_CONTROL_1);
|
||||
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
|
||||
u16 pwr_reg = snd_soc_component_read32(component, WM8961_PWR_MGMT_2);
|
||||
u16 spk_reg = snd_soc_component_read32(component, WM8961_CLASS_D_CONTROL_1);
|
||||
|
||||
if (event & SND_SOC_DAPM_POST_PMU) {
|
||||
/* Enable the PGA */
|
||||
pwr_reg |= WM8961_SPKL_PGA | WM8961_SPKR_PGA;
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
|
||||
/* Enable the amplifier */
|
||||
spk_reg |= WM8961_SPKL_ENA | WM8961_SPKR_ENA;
|
||||
snd_soc_write(codec, WM8961_CLASS_D_CONTROL_1, spk_reg);
|
||||
snd_soc_component_write(component, WM8961_CLASS_D_CONTROL_1, spk_reg);
|
||||
}
|
||||
|
||||
if (event & SND_SOC_DAPM_PRE_PMD) {
|
||||
/* Disable the amplifier */
|
||||
spk_reg &= ~(WM8961_SPKL_ENA | WM8961_SPKR_ENA);
|
||||
snd_soc_write(codec, WM8961_CLASS_D_CONTROL_1, spk_reg);
|
||||
snd_soc_component_write(component, WM8961_CLASS_D_CONTROL_1, spk_reg);
|
||||
|
||||
/* Disable the PGA */
|
||||
pwr_reg &= ~(WM8961_SPKL_PGA | WM8961_SPKR_PGA);
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_2, pwr_reg);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -505,15 +505,15 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8961_priv *wm8961 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8961_priv *wm8961 = snd_soc_component_get_drvdata(component);
|
||||
int i, best, target, fs;
|
||||
u16 reg;
|
||||
|
||||
fs = params_rate(params);
|
||||
|
||||
if (!wm8961->sysclk) {
|
||||
dev_err(codec->dev, "MCLK has not been specified\n");
|
||||
dev_err(component->dev, "MCLK has not been specified\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -524,23 +524,23 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
|
|||
abs(wm8961_srate[best].rate - fs))
|
||||
best = i;
|
||||
}
|
||||
reg = snd_soc_read(codec, WM8961_ADDITIONAL_CONTROL_3);
|
||||
reg = snd_soc_component_read32(component, WM8961_ADDITIONAL_CONTROL_3);
|
||||
reg &= ~WM8961_SAMPLE_RATE_MASK;
|
||||
reg |= wm8961_srate[best].val;
|
||||
snd_soc_write(codec, WM8961_ADDITIONAL_CONTROL_3, reg);
|
||||
dev_dbg(codec->dev, "Selected SRATE %dHz for %dHz\n",
|
||||
snd_soc_component_write(component, WM8961_ADDITIONAL_CONTROL_3, reg);
|
||||
dev_dbg(component->dev, "Selected SRATE %dHz for %dHz\n",
|
||||
wm8961_srate[best].rate, fs);
|
||||
|
||||
/* Select a CLK_SYS/fs ratio equal to or higher than required */
|
||||
target = wm8961->sysclk / fs;
|
||||
|
||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && target < 64) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"SYSCLK must be at least 64*fs for DAC\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE && target < 256) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"SYSCLK must be at least 256*fs for ADC\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -550,19 +550,19 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
|
|||
break;
|
||||
}
|
||||
if (i == ARRAY_SIZE(wm8961_clk_sys_ratio)) {
|
||||
dev_err(codec->dev, "Unable to generate CLK_SYS_RATE\n");
|
||||
dev_err(component->dev, "Unable to generate CLK_SYS_RATE\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
dev_dbg(codec->dev, "Selected CLK_SYS_RATE of %d for %d/%d=%d\n",
|
||||
dev_dbg(component->dev, "Selected CLK_SYS_RATE of %d for %d/%d=%d\n",
|
||||
wm8961_clk_sys_ratio[i].ratio, wm8961->sysclk, fs,
|
||||
wm8961->sysclk / fs);
|
||||
|
||||
reg = snd_soc_read(codec, WM8961_CLOCKING_4);
|
||||
reg = snd_soc_component_read32(component, WM8961_CLOCKING_4);
|
||||
reg &= ~WM8961_CLK_SYS_RATE_MASK;
|
||||
reg |= wm8961_clk_sys_ratio[i].val << WM8961_CLK_SYS_RATE_SHIFT;
|
||||
snd_soc_write(codec, WM8961_CLOCKING_4, reg);
|
||||
snd_soc_component_write(component, WM8961_CLOCKING_4, reg);
|
||||
|
||||
reg = snd_soc_read(codec, WM8961_AUDIO_INTERFACE_0);
|
||||
reg = snd_soc_component_read32(component, WM8961_AUDIO_INTERFACE_0);
|
||||
reg &= ~WM8961_WL_MASK;
|
||||
switch (params_width(params)) {
|
||||
case 16:
|
||||
|
@ -579,15 +579,15 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
|
|||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
snd_soc_write(codec, WM8961_AUDIO_INTERFACE_0, reg);
|
||||
snd_soc_component_write(component, WM8961_AUDIO_INTERFACE_0, reg);
|
||||
|
||||
/* Sloping stop-band filter is recommended for <= 24kHz */
|
||||
reg = snd_soc_read(codec, WM8961_ADC_DAC_CONTROL_2);
|
||||
reg = snd_soc_component_read32(component, WM8961_ADC_DAC_CONTROL_2);
|
||||
if (fs <= 24000)
|
||||
reg |= WM8961_DACSLOPE;
|
||||
else
|
||||
reg &= ~WM8961_DACSLOPE;
|
||||
snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_2, reg);
|
||||
snd_soc_component_write(component, WM8961_ADC_DAC_CONTROL_2, reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -596,25 +596,25 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
|
|||
unsigned int freq,
|
||||
int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8961_priv *wm8961 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 reg = snd_soc_read(codec, WM8961_CLOCKING1);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8961_priv *wm8961 = snd_soc_component_get_drvdata(component);
|
||||
u16 reg = snd_soc_component_read32(component, WM8961_CLOCKING1);
|
||||
|
||||
if (freq > 33000000) {
|
||||
dev_err(codec->dev, "MCLK must be <33MHz\n");
|
||||
dev_err(component->dev, "MCLK must be <33MHz\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (freq > 16500000) {
|
||||
dev_dbg(codec->dev, "Using MCLK/2 for %dHz MCLK\n", freq);
|
||||
dev_dbg(component->dev, "Using MCLK/2 for %dHz MCLK\n", freq);
|
||||
reg |= WM8961_MCLKDIV;
|
||||
freq /= 2;
|
||||
} else {
|
||||
dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq);
|
||||
dev_dbg(component->dev, "Using MCLK/1 for %dHz MCLK\n", freq);
|
||||
reg &= ~WM8961_MCLKDIV;
|
||||
}
|
||||
|
||||
snd_soc_write(codec, WM8961_CLOCKING1, reg);
|
||||
snd_soc_component_write(component, WM8961_CLOCKING1, reg);
|
||||
|
||||
wm8961->sysclk = freq;
|
||||
|
||||
|
@ -623,8 +623,8 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
|
|||
|
||||
static int wm8961_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
u16 aif = snd_soc_read(codec, WM8961_AUDIO_INTERFACE_0);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u16 aif = snd_soc_component_read32(component, WM8961_AUDIO_INTERFACE_0);
|
||||
|
||||
aif &= ~(WM8961_BCLKINV | WM8961_LRP |
|
||||
WM8961_MS | WM8961_FORMAT_MASK);
|
||||
|
@ -684,26 +684,26 @@ static int wm8961_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
return snd_soc_write(codec, WM8961_AUDIO_INTERFACE_0, aif);
|
||||
return snd_soc_component_write(component, WM8961_AUDIO_INTERFACE_0, aif);
|
||||
}
|
||||
|
||||
static int wm8961_set_tristate(struct snd_soc_dai *dai, int tristate)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
u16 reg = snd_soc_read(codec, WM8961_ADDITIONAL_CONTROL_2);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u16 reg = snd_soc_component_read32(component, WM8961_ADDITIONAL_CONTROL_2);
|
||||
|
||||
if (tristate)
|
||||
reg |= WM8961_TRIS;
|
||||
else
|
||||
reg &= ~WM8961_TRIS;
|
||||
|
||||
return snd_soc_write(codec, WM8961_ADDITIONAL_CONTROL_2, reg);
|
||||
return snd_soc_component_write(component, WM8961_ADDITIONAL_CONTROL_2, reg);
|
||||
}
|
||||
|
||||
static int wm8961_digital_mute(struct snd_soc_dai *dai, int mute)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
u16 reg = snd_soc_read(codec, WM8961_ADC_DAC_CONTROL_1);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u16 reg = snd_soc_component_read32(component, WM8961_ADC_DAC_CONTROL_1);
|
||||
|
||||
if (mute)
|
||||
reg |= WM8961_DACMU;
|
||||
|
@ -712,27 +712,27 @@ static int wm8961_digital_mute(struct snd_soc_dai *dai, int mute)
|
|||
|
||||
msleep(17);
|
||||
|
||||
return snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_1, reg);
|
||||
return snd_soc_component_write(component, WM8961_ADC_DAC_CONTROL_1, reg);
|
||||
}
|
||||
|
||||
static int wm8961_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u16 reg;
|
||||
|
||||
switch (div_id) {
|
||||
case WM8961_BCLK:
|
||||
reg = snd_soc_read(codec, WM8961_CLOCKING2);
|
||||
reg = snd_soc_component_read32(component, WM8961_CLOCKING2);
|
||||
reg &= ~WM8961_BCLKDIV_MASK;
|
||||
reg |= div;
|
||||
snd_soc_write(codec, WM8961_CLOCKING2, reg);
|
||||
snd_soc_component_write(component, WM8961_CLOCKING2, reg);
|
||||
break;
|
||||
|
||||
case WM8961_LRCLK:
|
||||
reg = snd_soc_read(codec, WM8961_AUDIO_INTERFACE_2);
|
||||
reg = snd_soc_component_read32(component, WM8961_AUDIO_INTERFACE_2);
|
||||
reg &= ~WM8961_LRCLK_RATE_MASK;
|
||||
reg |= div;
|
||||
snd_soc_write(codec, WM8961_AUDIO_INTERFACE_2, reg);
|
||||
snd_soc_component_write(component, WM8961_AUDIO_INTERFACE_2, reg);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -742,7 +742,7 @@ static int wm8961_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int wm8961_set_bias_level(struct snd_soc_codec *codec,
|
||||
static int wm8961_set_bias_level(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
u16 reg;
|
||||
|
@ -757,36 +757,36 @@ static int wm8961_set_bias_level(struct snd_soc_codec *codec,
|
|||
break;
|
||||
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) {
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
|
||||
/* Enable bias generation */
|
||||
reg = snd_soc_read(codec, WM8961_ANTI_POP);
|
||||
reg = snd_soc_component_read32(component, WM8961_ANTI_POP);
|
||||
reg |= WM8961_BUFIOEN | WM8961_BUFDCOPEN;
|
||||
snd_soc_write(codec, WM8961_ANTI_POP, reg);
|
||||
snd_soc_component_write(component, WM8961_ANTI_POP, reg);
|
||||
|
||||
/* VMID=2*50k, VREF */
|
||||
reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);
|
||||
reg = snd_soc_component_read32(component, WM8961_PWR_MGMT_1);
|
||||
reg &= ~WM8961_VMIDSEL_MASK;
|
||||
reg |= (1 << WM8961_VMIDSEL_SHIFT) | WM8961_VREF;
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_1, reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_1, reg);
|
||||
}
|
||||
break;
|
||||
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_PREPARE) {
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_PREPARE) {
|
||||
/* VREF off */
|
||||
reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);
|
||||
reg = snd_soc_component_read32(component, WM8961_PWR_MGMT_1);
|
||||
reg &= ~WM8961_VREF;
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_1, reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_1, reg);
|
||||
|
||||
/* Bias generation off */
|
||||
reg = snd_soc_read(codec, WM8961_ANTI_POP);
|
||||
reg = snd_soc_component_read32(component, WM8961_ANTI_POP);
|
||||
reg &= ~(WM8961_BUFIOEN | WM8961_BUFDCOPEN);
|
||||
snd_soc_write(codec, WM8961_ANTI_POP, reg);
|
||||
snd_soc_component_write(component, WM8961_ANTI_POP, reg);
|
||||
|
||||
/* VMID off */
|
||||
reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);
|
||||
reg = snd_soc_component_read32(component, WM8961_PWR_MGMT_1);
|
||||
reg &= ~WM8961_VMIDSEL_MASK;
|
||||
snd_soc_write(codec, WM8961_PWR_MGMT_1, reg);
|
||||
snd_soc_component_write(component, WM8961_PWR_MGMT_1, reg);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -830,51 +830,51 @@ static struct snd_soc_dai_driver wm8961_dai = {
|
|||
.ops = &wm8961_dai_ops,
|
||||
};
|
||||
|
||||
static int wm8961_probe(struct snd_soc_codec *codec)
|
||||
static int wm8961_probe(struct snd_soc_component *component)
|
||||
{
|
||||
u16 reg;
|
||||
|
||||
/* Enable class W */
|
||||
reg = snd_soc_read(codec, WM8961_CHARGE_PUMP_B);
|
||||
reg = snd_soc_component_read32(component, WM8961_CHARGE_PUMP_B);
|
||||
reg |= WM8961_CP_DYN_PWR_MASK;
|
||||
snd_soc_write(codec, WM8961_CHARGE_PUMP_B, reg);
|
||||
snd_soc_component_write(component, WM8961_CHARGE_PUMP_B, reg);
|
||||
|
||||
/* Latch volume update bits (right channel only, we always
|
||||
* write both out) and default ZC on. */
|
||||
reg = snd_soc_read(codec, WM8961_ROUT1_VOLUME);
|
||||
snd_soc_write(codec, WM8961_ROUT1_VOLUME,
|
||||
reg = snd_soc_component_read32(component, WM8961_ROUT1_VOLUME);
|
||||
snd_soc_component_write(component, WM8961_ROUT1_VOLUME,
|
||||
reg | WM8961_LO1ZC | WM8961_OUT1VU);
|
||||
snd_soc_write(codec, WM8961_LOUT1_VOLUME, reg | WM8961_LO1ZC);
|
||||
reg = snd_soc_read(codec, WM8961_ROUT2_VOLUME);
|
||||
snd_soc_write(codec, WM8961_ROUT2_VOLUME,
|
||||
snd_soc_component_write(component, WM8961_LOUT1_VOLUME, reg | WM8961_LO1ZC);
|
||||
reg = snd_soc_component_read32(component, WM8961_ROUT2_VOLUME);
|
||||
snd_soc_component_write(component, WM8961_ROUT2_VOLUME,
|
||||
reg | WM8961_SPKRZC | WM8961_SPKVU);
|
||||
snd_soc_write(codec, WM8961_LOUT2_VOLUME, reg | WM8961_SPKLZC);
|
||||
snd_soc_component_write(component, WM8961_LOUT2_VOLUME, reg | WM8961_SPKLZC);
|
||||
|
||||
reg = snd_soc_read(codec, WM8961_RIGHT_ADC_VOLUME);
|
||||
snd_soc_write(codec, WM8961_RIGHT_ADC_VOLUME, reg | WM8961_ADCVU);
|
||||
reg = snd_soc_read(codec, WM8961_RIGHT_INPUT_VOLUME);
|
||||
snd_soc_write(codec, WM8961_RIGHT_INPUT_VOLUME, reg | WM8961_IPVU);
|
||||
reg = snd_soc_component_read32(component, WM8961_RIGHT_ADC_VOLUME);
|
||||
snd_soc_component_write(component, WM8961_RIGHT_ADC_VOLUME, reg | WM8961_ADCVU);
|
||||
reg = snd_soc_component_read32(component, WM8961_RIGHT_INPUT_VOLUME);
|
||||
snd_soc_component_write(component, WM8961_RIGHT_INPUT_VOLUME, reg | WM8961_IPVU);
|
||||
|
||||
/* Use soft mute by default */
|
||||
reg = snd_soc_read(codec, WM8961_ADC_DAC_CONTROL_2);
|
||||
reg = snd_soc_component_read32(component, WM8961_ADC_DAC_CONTROL_2);
|
||||
reg |= WM8961_DACSMM;
|
||||
snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_2, reg);
|
||||
snd_soc_component_write(component, WM8961_ADC_DAC_CONTROL_2, reg);
|
||||
|
||||
/* Use automatic clocking mode by default; for now this is all
|
||||
* we support.
|
||||
*/
|
||||
reg = snd_soc_read(codec, WM8961_CLOCKING_3);
|
||||
reg = snd_soc_component_read32(component, WM8961_CLOCKING_3);
|
||||
reg &= ~WM8961_MANUAL_MODE;
|
||||
snd_soc_write(codec, WM8961_CLOCKING_3, reg);
|
||||
snd_soc_component_write(component, WM8961_CLOCKING_3, reg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
||||
static int wm8961_resume(struct snd_soc_codec *codec)
|
||||
static int wm8961_resume(struct snd_soc_component *component)
|
||||
{
|
||||
snd_soc_cache_sync(codec);
|
||||
snd_soc_component_cache_sync(component);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -882,20 +882,21 @@ static int wm8961_resume(struct snd_soc_codec *codec)
|
|||
#define wm8961_resume NULL
|
||||
#endif
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
|
||||
.probe = wm8961_probe,
|
||||
.resume = wm8961_resume,
|
||||
.set_bias_level = wm8961_set_bias_level,
|
||||
.suspend_bias_off = true,
|
||||
|
||||
.component_driver = {
|
||||
.controls = wm8961_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8961_snd_controls),
|
||||
.dapm_widgets = wm8961_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets),
|
||||
.dapm_routes = audio_paths,
|
||||
.num_dapm_routes = ARRAY_SIZE(audio_paths),
|
||||
},
|
||||
static const struct snd_soc_component_driver soc_component_dev_wm8961 = {
|
||||
.probe = wm8961_probe,
|
||||
.resume = wm8961_resume,
|
||||
.set_bias_level = wm8961_set_bias_level,
|
||||
.controls = wm8961_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8961_snd_controls),
|
||||
.dapm_widgets = wm8961_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets),
|
||||
.dapm_routes = audio_paths,
|
||||
.num_dapm_routes = ARRAY_SIZE(audio_paths),
|
||||
.suspend_bias_off = 1,
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static const struct regmap_config wm8961_regmap = {
|
||||
|
@ -961,19 +962,12 @@ static int wm8961_i2c_probe(struct i2c_client *i2c,
|
|||
|
||||
i2c_set_clientdata(i2c, wm8961);
|
||||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_wm8961, &wm8961_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_wm8961, &wm8961_dai, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wm8961_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id wm8961_i2c_id[] = {
|
||||
{ "wm8961", 0 },
|
||||
{ }
|
||||
|
@ -985,7 +979,6 @@ static struct i2c_driver wm8961_i2c_driver = {
|
|||
.name = "wm8961",
|
||||
},
|
||||
.probe = wm8961_i2c_probe,
|
||||
.remove = wm8961_i2c_remove,
|
||||
.id_table = wm8961_i2c_id,
|
||||
};
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -3779,6 +3779,6 @@
|
|||
#define WM8962_VSS_ENA_SHIFT 0 /* VSS_ENA */
|
||||
#define WM8962_VSS_ENA_WIDTH 1 /* VSS_ENA */
|
||||
|
||||
int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
|
||||
int wm8962_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -89,7 +89,7 @@ static const struct reg_default wm8971_reg_defaults[] = {
|
|||
{ 42, 0x0079 },
|
||||
};
|
||||
|
||||
#define wm8971_reset(c) snd_soc_write(c, WM8971_RESET, 0)
|
||||
#define wm8971_reset(c) snd_soc_component_write(c, WM8971_RESET, 0)
|
||||
|
||||
/* WM8971 Controls */
|
||||
static const char *wm8971_bass[] = { "Linear Control", "Adaptive Boost" };
|
||||
|
@ -433,8 +433,8 @@ static int get_coeff(int mclk, int rate)
|
|||
static int wm8971_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
||||
int clk_id, unsigned int freq, int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct wm8971_priv *wm8971 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
switch (freq) {
|
||||
case 11289600:
|
||||
|
@ -451,7 +451,7 @@ static int wm8971_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||
static int wm8971_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
||||
unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
u16 iface = 0;
|
||||
|
||||
/* set master/slave audio interface */
|
||||
|
@ -502,7 +502,7 @@ static int wm8971_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
snd_soc_write(codec, WM8971_IFACE, iface);
|
||||
snd_soc_component_write(component, WM8971_IFACE, iface);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -510,10 +510,10 @@ static int wm8971_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 iface = snd_soc_read(codec, WM8971_IFACE) & 0x1f3;
|
||||
u16 srate = snd_soc_read(codec, WM8971_SRATE) & 0x1c0;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8971_priv *wm8971 = snd_soc_component_get_drvdata(component);
|
||||
u16 iface = snd_soc_component_read32(component, WM8971_IFACE) & 0x1f3;
|
||||
u16 srate = snd_soc_component_read32(component, WM8971_SRATE) & 0x1c0;
|
||||
int coeff = get_coeff(wm8971->sysclk, params_rate(params));
|
||||
|
||||
/* bit size */
|
||||
|
@ -532,9 +532,9 @@ static int wm8971_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
}
|
||||
|
||||
/* set iface & srate */
|
||||
snd_soc_write(codec, WM8971_IFACE, iface);
|
||||
snd_soc_component_write(component, WM8971_IFACE, iface);
|
||||
if (coeff >= 0)
|
||||
snd_soc_write(codec, WM8971_SRATE, srate |
|
||||
snd_soc_component_write(component, WM8971_SRATE, srate |
|
||||
(coeff_div[coeff].sr << 1) | coeff_div[coeff].usb);
|
||||
|
||||
return 0;
|
||||
|
@ -542,13 +542,13 @@ static int wm8971_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
|
||||
static int wm8971_mute(struct snd_soc_dai *dai, int mute)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
u16 mute_reg = snd_soc_read(codec, WM8971_ADCDAC) & 0xfff7;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u16 mute_reg = snd_soc_component_read32(component, WM8971_ADCDAC) & 0xfff7;
|
||||
|
||||
if (mute)
|
||||
snd_soc_write(codec, WM8971_ADCDAC, mute_reg | 0x8);
|
||||
snd_soc_component_write(component, WM8971_ADCDAC, mute_reg | 0x8);
|
||||
else
|
||||
snd_soc_write(codec, WM8971_ADCDAC, mute_reg);
|
||||
snd_soc_component_write(component, WM8971_ADCDAC, mute_reg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -561,37 +561,37 @@ static void wm8971_charge_work(struct work_struct *work)
|
|||
regmap_update_bits(wm8971->regmap, WM8971_PWR1, 0x0180, 0x0100);
|
||||
}
|
||||
|
||||
static int wm8971_set_bias_level(struct snd_soc_codec *codec,
|
||||
static int wm8971_set_bias_level(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
|
||||
u16 pwr_reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
|
||||
struct wm8971_priv *wm8971 = snd_soc_component_get_drvdata(component);
|
||||
u16 pwr_reg = snd_soc_component_read32(component, WM8971_PWR1) & 0xfe3e;
|
||||
|
||||
switch (level) {
|
||||
case SND_SOC_BIAS_ON:
|
||||
/* set vmid to 50k and unmute dac */
|
||||
snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x00c1);
|
||||
snd_soc_component_write(component, WM8971_PWR1, pwr_reg | 0x00c1);
|
||||
break;
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
/* Wait until fully charged */
|
||||
flush_delayed_work(&wm8971->charge_work);
|
||||
break;
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
|
||||
snd_soc_cache_sync(codec);
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
|
||||
snd_soc_component_cache_sync(component);
|
||||
/* charge output caps - set vmid to 5k for quick power up */
|
||||
snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x01c0);
|
||||
snd_soc_component_write(component, WM8971_PWR1, pwr_reg | 0x01c0);
|
||||
queue_delayed_work(system_power_efficient_wq,
|
||||
&wm8971->charge_work, msecs_to_jiffies(1000));
|
||||
} else {
|
||||
/* mute dac and set vmid to 500k, enable VREF */
|
||||
snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140);
|
||||
snd_soc_component_write(component, WM8971_PWR1, pwr_reg | 0x0140);
|
||||
}
|
||||
|
||||
break;
|
||||
case SND_SOC_BIAS_OFF:
|
||||
cancel_delayed_work_sync(&wm8971->charge_work);
|
||||
snd_soc_write(codec, WM8971_PWR1, 0x0001);
|
||||
snd_soc_component_write(component, WM8971_PWR1, 0x0001);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
|
@ -628,40 +628,41 @@ static struct snd_soc_dai_driver wm8971_dai = {
|
|||
.ops = &wm8971_dai_ops,
|
||||
};
|
||||
|
||||
static int wm8971_probe(struct snd_soc_codec *codec)
|
||||
static int wm8971_probe(struct snd_soc_component *component)
|
||||
{
|
||||
struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
|
||||
struct wm8971_priv *wm8971 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
INIT_DELAYED_WORK(&wm8971->charge_work, wm8971_charge_work);
|
||||
|
||||
wm8971_reset(codec);
|
||||
wm8971_reset(component);
|
||||
|
||||
/* set the update bits */
|
||||
snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_RDAC, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_LOUT1V, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_ROUT1V, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_LOUT2V, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_ROUT2V, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_LINVOL, 0x0100, 0x0100);
|
||||
snd_soc_update_bits(codec, WM8971_RINVOL, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_LDAC, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_RDAC, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_LOUT1V, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_ROUT1V, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_LOUT2V, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_ROUT2V, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_LINVOL, 0x0100, 0x0100);
|
||||
snd_soc_component_update_bits(component, WM8971_RINVOL, 0x0100, 0x0100);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8971 = {
|
||||
.probe = wm8971_probe,
|
||||
.set_bias_level = wm8971_set_bias_level,
|
||||
.suspend_bias_off = true,
|
||||
|
||||
.component_driver = {
|
||||
.controls = wm8971_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8971_snd_controls),
|
||||
.dapm_widgets = wm8971_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8971_dapm_widgets),
|
||||
.dapm_routes = wm8971_dapm_routes,
|
||||
.num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes),
|
||||
},
|
||||
static const struct snd_soc_component_driver soc_component_dev_wm8971 = {
|
||||
.probe = wm8971_probe,
|
||||
.set_bias_level = wm8971_set_bias_level,
|
||||
.controls = wm8971_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8971_snd_controls),
|
||||
.dapm_widgets = wm8971_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8971_dapm_widgets),
|
||||
.dapm_routes = wm8971_dapm_routes,
|
||||
.num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes),
|
||||
.suspend_bias_off = 1,
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static const struct regmap_config wm8971_regmap = {
|
||||
|
@ -691,18 +692,12 @@ static int wm8971_i2c_probe(struct i2c_client *i2c,
|
|||
|
||||
i2c_set_clientdata(i2c, wm8971);
|
||||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_wm8971, &wm8971_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_wm8971, &wm8971_dai, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wm8971_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id wm8971_i2c_id[] = {
|
||||
{ "wm8971", 0 },
|
||||
{ }
|
||||
|
@ -714,7 +709,6 @@ static struct i2c_driver wm8971_i2c_driver = {
|
|||
.name = "wm8971",
|
||||
},
|
||||
.probe = wm8971_i2c_probe,
|
||||
.remove = wm8971_i2c_remove,
|
||||
.id_table = wm8971_i2c_id,
|
||||
};
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ static const struct reg_default wm8974_reg_defaults[] = {
|
|||
#define WM8974_POWER1_BIASEN 0x08
|
||||
#define WM8974_POWER1_BUFIOEN 0x04
|
||||
|
||||
#define wm8974_reset(c) snd_soc_write(c, WM8974_RESET, 0)
|
||||
#define wm8974_reset(c) snd_soc_component_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" };
|
||||
|
@ -324,33 +324,33 @@ static void pll_factors(struct pll_ *pll_div,
|
|||
static int wm8974_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 snd_soc_component *component = codec_dai->component;
|
||||
struct pll_ pll_div;
|
||||
u16 reg;
|
||||
|
||||
if (freq_in == 0 || freq_out == 0) {
|
||||
/* Clock CODEC directly from MCLK */
|
||||
reg = snd_soc_read(codec, WM8974_CLOCK);
|
||||
snd_soc_write(codec, WM8974_CLOCK, reg & 0x0ff);
|
||||
reg = snd_soc_component_read32(component, WM8974_CLOCK);
|
||||
snd_soc_component_write(component, WM8974_CLOCK, reg & 0x0ff);
|
||||
|
||||
/* Turn off PLL */
|
||||
reg = snd_soc_read(codec, WM8974_POWER1);
|
||||
snd_soc_write(codec, WM8974_POWER1, reg & 0x1df);
|
||||
reg = snd_soc_component_read32(component, WM8974_POWER1);
|
||||
snd_soc_component_write(component, WM8974_POWER1, reg & 0x1df);
|
||||
return 0;
|
||||
}
|
||||
|
||||
pll_factors(&pll_div, freq_out, 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);
|
||||
snd_soc_component_write(component, WM8974_PLLN, (pll_div.pre_div << 4) | pll_div.n);
|
||||
snd_soc_component_write(component, WM8974_PLLK1, pll_div.k >> 18);
|
||||
snd_soc_component_write(component, WM8974_PLLK2, (pll_div.k >> 9) & 0x1ff);
|
||||
snd_soc_component_write(component, WM8974_PLLK3, pll_div.k & 0x1ff);
|
||||
reg = snd_soc_component_read32(component, WM8974_POWER1);
|
||||
snd_soc_component_write(component, 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);
|
||||
reg = snd_soc_component_read32(component, WM8974_CLOCK);
|
||||
snd_soc_component_write(component, WM8974_CLOCK, reg | 0x100);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -361,21 +361,21 @@ static int wm8974_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
static int wm8974_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
|
||||
int div_id, int div)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
u16 reg;
|
||||
|
||||
switch (div_id) {
|
||||
case WM8974_OPCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8974_GPIO) & 0x1cf;
|
||||
snd_soc_write(codec, WM8974_GPIO, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8974_GPIO) & 0x1cf;
|
||||
snd_soc_component_write(component, WM8974_GPIO, reg | div);
|
||||
break;
|
||||
case WM8974_MCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8974_CLOCK) & 0x11f;
|
||||
snd_soc_write(codec, WM8974_CLOCK, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8974_CLOCK) & 0x11f;
|
||||
snd_soc_component_write(component, WM8974_CLOCK, reg | div);
|
||||
break;
|
||||
case WM8974_BCLKDIV:
|
||||
reg = snd_soc_read(codec, WM8974_CLOCK) & 0x1e3;
|
||||
snd_soc_write(codec, WM8974_CLOCK, reg | div);
|
||||
reg = snd_soc_component_read32(component, WM8974_CLOCK) & 0x1e3;
|
||||
snd_soc_component_write(component, WM8974_CLOCK, reg | div);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
|
@ -418,8 +418,8 @@ static unsigned int wm8974_get_mclkdiv(unsigned int f_in, unsigned int f_out,
|
|||
|
||||
static int wm8974_update_clocks(struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8974_priv *priv = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8974_priv *priv = snd_soc_component_get_drvdata(component);
|
||||
unsigned int fs256;
|
||||
unsigned int fpll = 0;
|
||||
unsigned int f;
|
||||
|
@ -446,8 +446,8 @@ static int wm8974_update_clocks(struct snd_soc_dai *dai)
|
|||
static int wm8974_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
|
||||
unsigned int freq, int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8974_priv *priv = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8974_priv *priv = snd_soc_component_get_drvdata(component);
|
||||
|
||||
if (dir != SND_SOC_CLOCK_IN)
|
||||
return -EINVAL;
|
||||
|
@ -460,9 +460,9 @@ static int wm8974_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
|
|||
static int wm8974_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
||||
unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
u16 iface = 0;
|
||||
u16 clk = snd_soc_read(codec, WM8974_CLOCK) & 0x1fe;
|
||||
u16 clk = snd_soc_component_read32(component, WM8974_CLOCK) & 0x1fe;
|
||||
|
||||
/* set master/slave audio interface */
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
|
@ -509,8 +509,8 @@ static int wm8974_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
snd_soc_write(codec, WM8974_IFACE, iface);
|
||||
snd_soc_write(codec, WM8974_CLOCK, clk);
|
||||
snd_soc_component_write(component, WM8974_IFACE, iface);
|
||||
snd_soc_component_write(component, WM8974_CLOCK, clk);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -518,10 +518,10 @@ static int wm8974_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct wm8974_priv *priv = snd_soc_codec_get_drvdata(codec);
|
||||
u16 iface = snd_soc_read(codec, WM8974_IFACE) & 0x19f;
|
||||
u16 adn = snd_soc_read(codec, WM8974_ADD) & 0x1f1;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct wm8974_priv *priv = snd_soc_component_get_drvdata(component);
|
||||
u16 iface = snd_soc_component_read32(component, WM8974_IFACE) & 0x19f;
|
||||
u16 adn = snd_soc_component_read32(component, WM8974_ADD) & 0x1f1;
|
||||
int err;
|
||||
|
||||
priv->fs = params_rate(params);
|
||||
|
@ -566,55 +566,55 @@ static int wm8974_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
break;
|
||||
}
|
||||
|
||||
snd_soc_write(codec, WM8974_IFACE, iface);
|
||||
snd_soc_write(codec, WM8974_ADD, adn);
|
||||
snd_soc_component_write(component, WM8974_IFACE, iface);
|
||||
snd_soc_component_write(component, 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 = snd_soc_read(codec, WM8974_DAC) & 0xffbf;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u16 mute_reg = snd_soc_component_read32(component, WM8974_DAC) & 0xffbf;
|
||||
|
||||
if (mute)
|
||||
snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40);
|
||||
snd_soc_component_write(component, WM8974_DAC, mute_reg | 0x40);
|
||||
else
|
||||
snd_soc_write(codec, WM8974_DAC, mute_reg);
|
||||
snd_soc_component_write(component, WM8974_DAC, mute_reg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* liam need to make this lower power with dapm */
|
||||
static int wm8974_set_bias_level(struct snd_soc_codec *codec,
|
||||
static int wm8974_set_bias_level(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
u16 power1 = snd_soc_read(codec, WM8974_POWER1) & ~0x3;
|
||||
u16 power1 = snd_soc_component_read32(component, WM8974_POWER1) & ~0x3;
|
||||
|
||||
switch (level) {
|
||||
case SND_SOC_BIAS_ON:
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
power1 |= 0x1; /* VMID 50k */
|
||||
snd_soc_write(codec, WM8974_POWER1, power1);
|
||||
snd_soc_component_write(component, WM8974_POWER1, power1);
|
||||
break;
|
||||
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
power1 |= WM8974_POWER1_BIASEN | WM8974_POWER1_BUFIOEN;
|
||||
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
|
||||
regcache_sync(dev_get_regmap(codec->dev, NULL));
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
|
||||
regcache_sync(dev_get_regmap(component->dev, NULL));
|
||||
|
||||
/* Initial cap charge at VMID 5k */
|
||||
snd_soc_write(codec, WM8974_POWER1, power1 | 0x3);
|
||||
snd_soc_component_write(component, WM8974_POWER1, power1 | 0x3);
|
||||
mdelay(100);
|
||||
}
|
||||
|
||||
power1 |= 0x2; /* VMID 500k */
|
||||
snd_soc_write(codec, WM8974_POWER1, power1);
|
||||
snd_soc_component_write(component, WM8974_POWER1, power1);
|
||||
break;
|
||||
|
||||
case SND_SOC_BIAS_OFF:
|
||||
snd_soc_write(codec, WM8974_POWER1, 0);
|
||||
snd_soc_write(codec, WM8974_POWER2, 0);
|
||||
snd_soc_write(codec, WM8974_POWER3, 0);
|
||||
snd_soc_component_write(component, WM8974_POWER1, 0);
|
||||
snd_soc_component_write(component, WM8974_POWER2, 0);
|
||||
snd_soc_component_write(component, WM8974_POWER3, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -663,32 +663,33 @@ static const struct regmap_config wm8974_regmap = {
|
|||
.cache_type = REGCACHE_FLAT,
|
||||
};
|
||||
|
||||
static int wm8974_probe(struct snd_soc_codec *codec)
|
||||
static int wm8974_probe(struct snd_soc_component *component)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
ret = wm8974_reset(codec);
|
||||
ret = wm8974_reset(component);
|
||||
if (ret < 0) {
|
||||
dev_err(codec->dev, "Failed to issue reset\n");
|
||||
dev_err(component->dev, "Failed to issue reset\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8974 = {
|
||||
.probe = wm8974_probe,
|
||||
.set_bias_level = wm8974_set_bias_level,
|
||||
.suspend_bias_off = true,
|
||||
|
||||
.component_driver = {
|
||||
.controls = wm8974_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8974_snd_controls),
|
||||
.dapm_widgets = wm8974_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8974_dapm_widgets),
|
||||
.dapm_routes = wm8974_dapm_routes,
|
||||
.num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes),
|
||||
},
|
||||
static const struct snd_soc_component_driver soc_component_dev_wm8974 = {
|
||||
.probe = wm8974_probe,
|
||||
.set_bias_level = wm8974_set_bias_level,
|
||||
.controls = wm8974_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(wm8974_snd_controls),
|
||||
.dapm_widgets = wm8974_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(wm8974_dapm_widgets),
|
||||
.dapm_routes = wm8974_dapm_routes,
|
||||
.num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes),
|
||||
.suspend_bias_off = 1,
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static int wm8974_i2c_probe(struct i2c_client *i2c,
|
||||
|
@ -708,19 +709,12 @@ static int wm8974_i2c_probe(struct i2c_client *i2c,
|
|||
if (IS_ERR(regmap))
|
||||
return PTR_ERR(regmap);
|
||||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_wm8974, &wm8974_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_wm8974, &wm8974_dai, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int wm8974_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id wm8974_i2c_id[] = {
|
||||
{ "wm8974", 0 },
|
||||
{ }
|
||||
|
@ -739,7 +733,6 @@ static struct i2c_driver wm8974_i2c_driver = {
|
|||
.of_match_table = wm8974_of_match,
|
||||
},
|
||||
.probe = wm8974_i2c_probe,
|
||||
.remove = wm8974_i2c_remove,
|
||||
.id_table = wm8974_i2c_id,
|
||||
};
|
||||
|
||||
|
|
|
@ -179,12 +179,12 @@ static struct snd_soc_jack_pin tobermory_headset_pins[] = {
|
|||
static int tobermory_late_probe(struct snd_soc_card *card)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd;
|
||||
struct snd_soc_codec *codec;
|
||||
struct snd_soc_component *component;
|
||||
struct snd_soc_dai *codec_dai;
|
||||
int ret;
|
||||
|
||||
rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
|
||||
codec = rtd->codec;
|
||||
component = rtd->codec_dai->component;
|
||||
codec_dai = rtd->codec_dai;
|
||||
|
||||
ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,
|
||||
|
@ -199,7 +199,7 @@ static int tobermory_late_probe(struct snd_soc_card *card)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
wm8962_mic_detect(codec, &tobermory_headset);
|
||||
wm8962_mic_detect(component, &tobermory_headset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue