Skip to content

L
linux
Commit cbc23b74 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: wm8985: replace codec to component 

Now we can replace Codec to Component. Let's do it.

Note:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 107 deletions
sound/soc/codecs/wm8985.c
View file @ cbc23b74
...@@ -564,10 +564,10 @@ static const struct snd_soc_dapm_route wm8985_aux_dapm_routes[] = { ...@@ -564,10 +564,10 @@ static const struct snd_soc_dapm_route wm8985_aux_dapm_routes[] = {
{ "Left Boost Mixer", "AUXL Volume", "AUXL" }, { "Left Boost Mixer", "AUXL Volume", "AUXL" },
}; };
static int wm8985_add_widgets(struct snd_soc_codec *codec) static int wm8985_add_widgets(struct snd_soc_component *component)
{ {
struct wm8985_priv *wm8985 = snd_soc_codec_get_drvdata(codec); struct wm8985_priv *wm8985 = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
switch (wm8985->dev_type) { switch (wm8985->dev_type) {
case WM8758: case WM8758:
...@@ -576,7 +576,7 @@ static int wm8985_add_widgets(struct snd_soc_codec *codec) ...@@ -576,7 +576,7 @@ static int wm8985_add_widgets(struct snd_soc_codec *codec)
break; break;
case WM8985: case WM8985:
snd_soc_add_codec_controls(codec, wm8985_specific_snd_controls, snd_soc_add_component_controls(component, wm8985_specific_snd_controls,
ARRAY_SIZE(wm8985_specific_snd_controls)); ARRAY_SIZE(wm8985_specific_snd_controls));
snd_soc_dapm_new_controls(dapm, wm8985_dapm_widgets, snd_soc_dapm_new_controls(dapm, wm8985_dapm_widgets,
...@@ -592,10 +592,10 @@ static int wm8985_add_widgets(struct snd_soc_codec *codec) ...@@ -592,10 +592,10 @@ static int wm8985_add_widgets(struct snd_soc_codec *codec)
static int eqmode_get(struct snd_kcontrol *kcontrol, static int eqmode_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
unsigned int reg; unsigned int reg;
reg = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF); reg = snd_soc_component_read32(component, WM8985_EQ1_LOW_SHELF);
if (reg & WM8985_EQ3DMODE) if (reg & WM8985_EQ3DMODE)
ucontrol->value.enumerated.item[0] = 1; ucontrol->value.enumerated.item[0] = 1;
else else
...@@ -607,7 +607,7 @@ static int eqmode_get(struct snd_kcontrol *kcontrol, ...@@ -607,7 +607,7 @@ static int eqmode_get(struct snd_kcontrol *kcontrol,
static int eqmode_put(struct snd_kcontrol *kcontrol, static int eqmode_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
unsigned int regpwr2, regpwr3; unsigned int regpwr2, regpwr3;
unsigned int reg_eq; unsigned int reg_eq;
...@@ -615,7 +615,7 @@ static int eqmode_put(struct snd_kcontrol *kcontrol, ...@@ -615,7 +615,7 @@ static int eqmode_put(struct snd_kcontrol *kcontrol,
&& ucontrol->value.enumerated.item[0] != 1) && ucontrol->value.enumerated.item[0] != 1)
return -EINVAL; return -EINVAL;
reg_eq = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF); reg_eq = snd_soc_component_read32(component, WM8985_EQ1_LOW_SHELF);
switch ((reg_eq & WM8985_EQ3DMODE) >> WM8985_EQ3DMODE_SHIFT) { switch ((reg_eq & WM8985_EQ3DMODE) >> WM8985_EQ3DMODE_SHIFT) {
case 0: case 0:
if (!ucontrol->value.enumerated.item[0]) if (!ucontrol->value.enumerated.item[0])
...@@ -627,46 +627,46 @@ static int eqmode_put(struct snd_kcontrol *kcontrol, ...@@ -627,46 +627,46 @@ static int eqmode_put(struct snd_kcontrol *kcontrol,
break; break;
} }
regpwr2 = snd_soc_read(codec, WM8985_POWER_MANAGEMENT_2); regpwr2 = snd_soc_component_read32(component, WM8985_POWER_MANAGEMENT_2);
regpwr3 = snd_soc_read(codec, WM8985_POWER_MANAGEMENT_3); regpwr3 = snd_soc_component_read32(component, WM8985_POWER_MANAGEMENT_3);
/* disable the DACs and ADCs */ /* disable the DACs and ADCs */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_2, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_2,
WM8985_ADCENR_MASK | WM8985_ADCENL_MASK, 0); WM8985_ADCENR_MASK | WM8985_ADCENL_MASK, 0);
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_3, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_3,
WM8985_DACENR_MASK | WM8985_DACENL_MASK, 0); WM8985_DACENR_MASK | WM8985_DACENL_MASK, 0);
snd_soc_update_bits(codec, WM8985_ADDITIONAL_CONTROL, snd_soc_component_update_bits(component, WM8985_ADDITIONAL_CONTROL,
WM8985_M128ENB_MASK, WM8985_M128ENB); WM8985_M128ENB_MASK, WM8985_M128ENB);
/* set the desired eqmode */ /* set the desired eqmode */
snd_soc_update_bits(codec, WM8985_EQ1_LOW_SHELF, snd_soc_component_update_bits(component, WM8985_EQ1_LOW_SHELF,
WM8985_EQ3DMODE_MASK, WM8985_EQ3DMODE_MASK,
ucontrol->value.enumerated.item[0] ucontrol->value.enumerated.item[0]
<< WM8985_EQ3DMODE_SHIFT); << WM8985_EQ3DMODE_SHIFT);
/* restore DAC/ADC configuration */ /* restore DAC/ADC configuration */
snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, regpwr2); snd_soc_component_write(component, WM8985_POWER_MANAGEMENT_2, regpwr2);
snd_soc_write(codec, WM8985_POWER_MANAGEMENT_3, regpwr3); snd_soc_component_write(component, WM8985_POWER_MANAGEMENT_3, regpwr3);
return 0; return 0;
} }
static int wm8985_reset(struct snd_soc_codec *codec) static int wm8985_reset(struct snd_soc_component *component)
{ {
return snd_soc_write(codec, WM8985_SOFTWARE_RESET, 0x0); return snd_soc_component_write(component, WM8985_SOFTWARE_RESET, 0x0);
} }
static int wm8985_dac_mute(struct snd_soc_dai *dai, int mute) static int wm8985_dac_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
return snd_soc_update_bits(codec, WM8985_DAC_CONTROL, return snd_soc_component_update_bits(component, WM8985_DAC_CONTROL,
WM8985_SOFTMUTE_MASK, WM8985_SOFTMUTE_MASK,
!!mute << WM8985_SOFTMUTE_SHIFT); !!mute << WM8985_SOFTMUTE_SHIFT);
} }
static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec; struct snd_soc_component *component;
u16 format, master, bcp, lrp; u16 format, master, bcp, lrp;
codec = dai->codec; component = dai->component;
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S:
...@@ -687,7 +687,7 @@ static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -687,7 +687,7 @@ static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8985_AUDIO_INTERFACE, snd_soc_component_update_bits(component, WM8985_AUDIO_INTERFACE,
WM8985_FMT_MASK, format << WM8985_FMT_SHIFT); WM8985_FMT_MASK, format << WM8985_FMT_SHIFT);
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
...@@ -702,7 +702,7 @@ static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -702,7 +702,7 @@ static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL, snd_soc_component_update_bits(component, WM8985_CLOCK_GEN_CONTROL,
WM8985_MS_MASK, master << WM8985_MS_SHIFT); WM8985_MS_MASK, master << WM8985_MS_SHIFT);
/* frame inversion is not valid for dsp modes */ /* frame inversion is not valid for dsp modes */
...@@ -739,9 +739,9 @@ static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -739,9 +739,9 @@ static int wm8985_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8985_AUDIO_INTERFACE, snd_soc_component_update_bits(component, WM8985_AUDIO_INTERFACE,
WM8985_LRP_MASK, lrp << WM8985_LRP_SHIFT); WM8985_LRP_MASK, lrp << WM8985_LRP_SHIFT);
snd_soc_update_bits(codec, WM8985_AUDIO_INTERFACE, snd_soc_component_update_bits(component, WM8985_AUDIO_INTERFACE,
WM8985_BCP_MASK, bcp << WM8985_BCP_SHIFT); WM8985_BCP_MASK, bcp << WM8985_BCP_SHIFT);
return 0; return 0;
} }
...@@ -751,14 +751,14 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream, ...@@ -751,14 +751,14 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
int i; int i;
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct wm8985_priv *wm8985; struct wm8985_priv *wm8985;
u16 blen, srate_idx; u16 blen, srate_idx;
unsigned int tmp; unsigned int tmp;
int srate_best; int srate_best;
codec = dai->codec; component = dai->component;
wm8985 = snd_soc_codec_get_drvdata(codec); wm8985 = snd_soc_component_get_drvdata(component);
wm8985->bclk = snd_soc_params_to_bclk(params); wm8985->bclk = snd_soc_params_to_bclk(params);
if ((int)wm8985->bclk < 0) if ((int)wm8985->bclk < 0)
...@@ -783,7 +783,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream, ...@@ -783,7 +783,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8985_AUDIO_INTERFACE, snd_soc_component_update_bits(component, WM8985_AUDIO_INTERFACE,
WM8985_WL_MASK, blen << WM8985_WL_SHIFT); WM8985_WL_MASK, blen << WM8985_WL_SHIFT);
/* /*
...@@ -800,7 +800,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream, ...@@ -800,7 +800,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
} }
dev_dbg(dai->dev, "Selected SRATE = %d\n", srates[srate_idx]); dev_dbg(dai->dev, "Selected SRATE = %d\n", srates[srate_idx]);
snd_soc_update_bits(codec, WM8985_ADDITIONAL_CONTROL, snd_soc_component_update_bits(component, WM8985_ADDITIONAL_CONTROL,
WM8985_SR_MASK, srate_idx << WM8985_SR_SHIFT); WM8985_SR_MASK, srate_idx << WM8985_SR_SHIFT);
dev_dbg(dai->dev, "Target BCLK = %uHz\n", wm8985->bclk); dev_dbg(dai->dev, "Target BCLK = %uHz\n", wm8985->bclk);
...@@ -819,7 +819,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream, ...@@ -819,7 +819,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
} }
dev_dbg(dai->dev, "MCLK ratio = %dfs\n", fs_ratios[i].ratio); dev_dbg(dai->dev, "MCLK ratio = %dfs\n", fs_ratios[i].ratio);
snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL, snd_soc_component_update_bits(component, WM8985_CLOCK_GEN_CONTROL,
WM8985_MCLKDIV_MASK, i << WM8985_MCLKDIV_SHIFT); WM8985_MCLKDIV_MASK, i << WM8985_MCLKDIV_SHIFT);
/* select the appropriate bclk divider */ /* select the appropriate bclk divider */
...@@ -835,7 +835,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream, ...@@ -835,7 +835,7 @@ static int wm8985_hw_params(struct snd_pcm_substream *substream,
} }
dev_dbg(dai->dev, "BCLK div = %d\n", i); dev_dbg(dai->dev, "BCLK div = %d\n", i);
snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL, snd_soc_component_update_bits(component, WM8985_CLOCK_GEN_CONTROL,
WM8985_BCLKDIV_MASK, i << WM8985_BCLKDIV_SHIFT); WM8985_BCLKDIV_MASK, i << WM8985_BCLKDIV_SHIFT);
return 0; return 0;
} }
...@@ -887,13 +887,13 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -887,13 +887,13 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id,
unsigned int freq_out) unsigned int freq_out)
{ {
int ret; int ret;
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct pll_div pll_div; struct pll_div pll_div;
codec = dai->codec; component = dai->component;
if (!freq_in || !freq_out) { if (!freq_in || !freq_out) {
/* disable the PLL */ /* disable the PLL */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_PLLEN_MASK, 0); WM8985_PLLEN_MASK, 0);
} else { } else {
ret = pll_factors(&pll_div, freq_out * 4 * 2, freq_in); ret = pll_factors(&pll_div, freq_out * 4 * 2, freq_in);
...@@ -901,18 +901,18 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -901,18 +901,18 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id,
return ret; return ret;
/* set PLLN and PRESCALE */ /* set PLLN and PRESCALE */
snd_soc_write(codec, WM8985_PLL_N, snd_soc_component_write(component, WM8985_PLL_N,
(pll_div.div2 << WM8985_PLL_PRESCALE_SHIFT) (pll_div.div2 << WM8985_PLL_PRESCALE_SHIFT)
| pll_div.n); | pll_div.n);
/* set PLLK */ /* set PLLK */
snd_soc_write(codec, WM8985_PLL_K_3, pll_div.k & 0x1ff); snd_soc_component_write(component, WM8985_PLL_K_3, pll_div.k & 0x1ff);
snd_soc_write(codec, WM8985_PLL_K_2, (pll_div.k >> 9) & 0x1ff); snd_soc_component_write(component, WM8985_PLL_K_2, (pll_div.k >> 9) & 0x1ff);
snd_soc_write(codec, WM8985_PLL_K_1, (pll_div.k >> 18)); snd_soc_component_write(component, WM8985_PLL_K_1, (pll_div.k >> 18));
/* set the source of the clock to be the PLL */ /* set the source of the clock to be the PLL */
snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL, snd_soc_component_update_bits(component, WM8985_CLOCK_GEN_CONTROL,
WM8985_CLKSEL_MASK, WM8985_CLKSEL); WM8985_CLKSEL_MASK, WM8985_CLKSEL);
/* enable the PLL */ /* enable the PLL */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_PLLEN_MASK, WM8985_PLLEN); WM8985_PLLEN_MASK, WM8985_PLLEN);
} }
return 0; return 0;
...@@ -921,21 +921,21 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -921,21 +921,21 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id,
static int wm8985_set_sysclk(struct snd_soc_dai *dai, static int wm8985_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct wm8985_priv *wm8985; struct wm8985_priv *wm8985;
codec = dai->codec; component = dai->component;
wm8985 = snd_soc_codec_get_drvdata(codec); wm8985 = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case WM8985_CLKSRC_MCLK: case WM8985_CLKSRC_MCLK:
snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL, snd_soc_component_update_bits(component, WM8985_CLOCK_GEN_CONTROL,
WM8985_CLKSEL_MASK, 0); WM8985_CLKSEL_MASK, 0);
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_PLLEN_MASK, 0); WM8985_PLLEN_MASK, 0);
break; break;
case WM8985_CLKSRC_PLL: case WM8985_CLKSRC_PLL:
snd_soc_update_bits(codec, WM8985_CLOCK_GEN_CONTROL, snd_soc_component_update_bits(component, WM8985_CLOCK_GEN_CONTROL,
WM8985_CLKSEL_MASK, WM8985_CLKSEL); WM8985_CLKSEL_MASK, WM8985_CLKSEL);
break; break;
default: default:
...@@ -947,27 +947,27 @@ static int wm8985_set_sysclk(struct snd_soc_dai *dai, ...@@ -947,27 +947,27 @@ static int wm8985_set_sysclk(struct snd_soc_dai *dai,
return 0; return 0;
} }
static int wm8985_set_bias_level(struct snd_soc_codec *codec, static int wm8985_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
int ret; int ret;
struct wm8985_priv *wm8985; struct wm8985_priv *wm8985;
wm8985 = snd_soc_codec_get_drvdata(codec); wm8985 = snd_soc_component_get_drvdata(component);
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* VMID at 75k */ /* VMID at 75k */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_VMIDSEL_MASK, WM8985_VMIDSEL_MASK,
1 << WM8985_VMIDSEL_SHIFT); 1 << WM8985_VMIDSEL_SHIFT);
break; break;
case SND_SOC_BIAS_STANDBY: 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) {
ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies),
wm8985->supplies); wm8985->supplies);
if (ret) { if (ret) {
dev_err(codec->dev, dev_err(component->dev,
"Failed to enable supplies: %d\n", "Failed to enable supplies: %d\n",
ret); ret);
return ret; return ret;
...@@ -976,45 +976,45 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, ...@@ -976,45 +976,45 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
regcache_sync(wm8985->regmap); regcache_sync(wm8985->regmap);
/* enable anti-pop features */ /* enable anti-pop features */
snd_soc_update_bits(codec, WM8985_OUT4_TO_ADC, snd_soc_component_update_bits(component, WM8985_OUT4_TO_ADC,
WM8985_POBCTRL_MASK, WM8985_POBCTRL_MASK,
WM8985_POBCTRL); WM8985_POBCTRL);
/* enable thermal shutdown */ /* enable thermal shutdown */
snd_soc_update_bits(codec, WM8985_OUTPUT_CTRL0, snd_soc_component_update_bits(component, WM8985_OUTPUT_CTRL0,
WM8985_TSDEN_MASK, WM8985_TSDEN); WM8985_TSDEN_MASK, WM8985_TSDEN);
snd_soc_update_bits(codec, WM8985_OUTPUT_CTRL0, snd_soc_component_update_bits(component, WM8985_OUTPUT_CTRL0,
WM8985_TSOPCTRL_MASK, WM8985_TSOPCTRL_MASK,
WM8985_TSOPCTRL); WM8985_TSOPCTRL);
/* enable BIASEN */ /* enable BIASEN */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_BIASEN_MASK, WM8985_BIASEN); WM8985_BIASEN_MASK, WM8985_BIASEN);
/* VMID at 75k */ /* VMID at 75k */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_VMIDSEL_MASK, WM8985_VMIDSEL_MASK,
1 << WM8985_VMIDSEL_SHIFT); 1 << WM8985_VMIDSEL_SHIFT);
msleep(500); msleep(500);
/* disable anti-pop features */ /* disable anti-pop features */
snd_soc_update_bits(codec, WM8985_OUT4_TO_ADC, snd_soc_component_update_bits(component, WM8985_OUT4_TO_ADC,
WM8985_POBCTRL_MASK, 0); WM8985_POBCTRL_MASK, 0);
} }
/* VMID at 300k */ /* VMID at 300k */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_VMIDSEL_MASK, WM8985_VMIDSEL_MASK,
2 << WM8985_VMIDSEL_SHIFT); 2 << WM8985_VMIDSEL_SHIFT);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
/* disable thermal shutdown */ /* disable thermal shutdown */
snd_soc_update_bits(codec, WM8985_OUTPUT_CTRL0, snd_soc_component_update_bits(component, WM8985_OUTPUT_CTRL0,
WM8985_TSOPCTRL_MASK, 0); WM8985_TSOPCTRL_MASK, 0);
snd_soc_update_bits(codec, WM8985_OUTPUT_CTRL0, snd_soc_component_update_bits(component, WM8985_OUTPUT_CTRL0,
WM8985_TSDEN_MASK, 0); WM8985_TSDEN_MASK, 0);
/* disable VMIDSEL and BIASEN */ /* disable VMIDSEL and BIASEN */
snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8985_POWER_MANAGEMENT_1,
WM8985_VMIDSEL_MASK | WM8985_BIASEN_MASK, WM8985_VMIDSEL_MASK | WM8985_BIASEN_MASK,
0); 0);
snd_soc_write(codec, WM8985_POWER_MANAGEMENT_1, 0); snd_soc_component_write(component, WM8985_POWER_MANAGEMENT_1, 0);
snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, 0); snd_soc_component_write(component, WM8985_POWER_MANAGEMENT_2, 0);
snd_soc_write(codec, WM8985_POWER_MANAGEMENT_3, 0); snd_soc_component_write(component, WM8985_POWER_MANAGEMENT_3, 0);
regcache_mark_dirty(wm8985->regmap); regcache_mark_dirty(wm8985->regmap);
...@@ -1026,46 +1026,46 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, ...@@ -1026,46 +1026,46 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
return 0; return 0;
} }
static int wm8985_probe(struct snd_soc_codec *codec) static int wm8985_probe(struct snd_soc_component *component)
{ {
size_t i; size_t i;
struct wm8985_priv *wm8985; struct wm8985_priv *wm8985;
int ret; int ret;
wm8985 = snd_soc_codec_get_drvdata(codec); wm8985 = snd_soc_component_get_drvdata(component);
for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++) for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++)
wm8985->supplies[i].supply = wm8985_supply_names[i]; wm8985->supplies[i].supply = wm8985_supply_names[i];
ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8985->supplies), ret = devm_regulator_bulk_get(component->dev, ARRAY_SIZE(wm8985->supplies),
wm8985->supplies); wm8985->supplies);
if (ret) { if (ret) {
dev_err(codec->dev, "Failed to request supplies: %d\n", ret); dev_err(component->dev, "Failed to request supplies: %d\n", ret);
return ret; return ret;
} }
ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8985->supplies),
wm8985->supplies); wm8985->supplies);
if (ret) { if (ret) {
dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); dev_err(component->dev, "Failed to enable supplies: %d\n", ret);
return ret; return ret;
} }
ret = wm8985_reset(codec); ret = wm8985_reset(component);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset: %d\n", ret); dev_err(component->dev, "Failed to issue reset: %d\n", ret);
goto err_reg_enable; goto err_reg_enable;
} }
/* latch volume update bits */ /* latch volume update bits */
for (i = 0; i < ARRAY_SIZE(volume_update_regs); ++i) for (i = 0; i < ARRAY_SIZE(volume_update_regs); ++i)
snd_soc_update_bits(codec, volume_update_regs[i], snd_soc_component_update_bits(component, volume_update_regs[i],
0x100, 0x100); 0x100, 0x100);
/* enable BIASCUT */ /* enable BIASCUT */
snd_soc_update_bits(codec, WM8985_BIAS_CTRL, WM8985_BIASCUT, snd_soc_component_update_bits(component, WM8985_BIAS_CTRL, WM8985_BIASCUT,
WM8985_BIASCUT); WM8985_BIASCUT);
wm8985_add_widgets(codec); wm8985_add_widgets(component);
return 0; return 0;
...@@ -1105,19 +1105,20 @@ static struct snd_soc_dai_driver wm8985_dai = { ...@@ -1105,19 +1105,20 @@ static struct snd_soc_dai_driver wm8985_dai = {
.symmetric_rates = 1 .symmetric_rates = 1
}; };
static const struct snd_soc_codec_driver soc_codec_dev_wm8985 = { static const struct snd_soc_component_driver soc_component_dev_wm8985 = {
.probe = wm8985_probe, .probe = wm8985_probe,
.set_bias_level = wm8985_set_bias_level, .set_bias_level = wm8985_set_bias_level,
.suspend_bias_off = true, .controls = wm8985_common_snd_controls,
.num_controls = ARRAY_SIZE(wm8985_common_snd_controls),
.component_driver = { .dapm_widgets = wm8985_common_dapm_widgets,
.controls = wm8985_common_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8985_common_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8985_common_snd_controls), .dapm_routes = wm8985_common_dapm_routes,
.dapm_widgets = wm8985_common_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8985_common_dapm_routes),
.num_dapm_widgets = ARRAY_SIZE(wm8985_common_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = wm8985_common_dapm_routes, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(wm8985_common_dapm_routes), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct regmap_config wm8985_regmap = { static const struct regmap_config wm8985_regmap = {
...@@ -1154,23 +1155,16 @@ static int wm8985_spi_probe(struct spi_device *spi) ...@@ -1154,23 +1155,16 @@ static int wm8985_spi_probe(struct spi_device *spi)
return ret; return ret;
} }
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_wm8985, &wm8985_dai, 1); &soc_component_dev_wm8985, &wm8985_dai, 1);
return ret; return ret;
} }
static int wm8985_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
}
static struct spi_driver wm8985_spi_driver = { static struct spi_driver wm8985_spi_driver = {
.driver = { .driver = {
.name = "wm8985", .name = "wm8985",
}, },
.probe = wm8985_spi_probe, .probe = wm8985_spi_probe,
.remove = wm8985_spi_remove
}; };
#endif #endif
...@@ -1197,17 +1191,11 @@ static int wm8985_i2c_probe(struct i2c_client *i2c, ...@@ -1197,17 +1191,11 @@ static int wm8985_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8985, &wm8985_dai, 1); &soc_component_dev_wm8985, &wm8985_dai, 1);
return ret; return ret;
} }
static int wm8985_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
}
static const struct i2c_device_id wm8985_i2c_id[] = { static const struct i2c_device_id wm8985_i2c_id[] = {
{ "wm8985", WM8985 }, { "wm8985", WM8985 },
{ "wm8758", WM8758 }, { "wm8758", WM8758 },
...@@ -1220,7 +1208,6 @@ static struct i2c_driver wm8985_i2c_driver = { ...@@ -1220,7 +1208,6 @@ static struct i2c_driver wm8985_i2c_driver = {
.name = "wm8985", .name = "wm8985",
}, },
.probe = wm8985_i2c_probe, .probe = wm8985_i2c_probe,
.remove = wm8985_i2c_remove,
.id_table = wm8985_i2c_id .id_table = wm8985_i2c_id
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7