openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm8960: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-01-29 03:05:45 +00:00 committed by Mark Brown
parent 7928b2cbe5
commit e075fc17b7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 126 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
sound/soc/codecs/wm8960.c
View File

@ -49,7 +49,7 @@
#define WM8960_DRES_MASK 0x30 #define WM8960_DRES_MASK 0x30
static bool is_pll_freq_available(unsigned int source, unsigned int target); 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); unsigned int freq_in, unsigned int freq_out);
/* /*
* wm8960 register cache * wm8960 register cache
@ -123,7 +123,7 @@ static bool wm8960_volatile(struct device *dev, unsigned int reg)
struct wm8960_priv { struct wm8960_priv {
struct clk *mclk; struct clk *mclk;
struct regmap *regmap; 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); enum snd_soc_bias_level level);
struct snd_soc_dapm_widget *lout1; struct snd_soc_dapm_widget *lout1;
struct snd_soc_dapm_widget *rout1; 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 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; int val, i, best;
/* If we're using deemphasis select the nearest available sample /* 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; 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); 0x6, val);
} }
static int wm8960_get_deemph(struct snd_kcontrol *kcontrol, static int wm8960_get_deemph(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);
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = wm8960->deemph; ucontrol->value.integer.value[0] = wm8960->deemph;
return 0; return 0;
@ -208,8 +208,8 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, static int wm8960_put_deemph(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);
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
unsigned int deemph = ucontrol->value.integer.value[0]; unsigned int deemph = ucontrol->value.integer.value[0];
if (deemph > 1) if (deemph > 1)
@ -217,7 +217,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
wm8960->deemph = deemph; wm8960->deemph = deemph;
return wm8960_set_deemph(codec); return wm8960_set_deemph(component);
} }
static const DECLARE_TLV_DB_SCALE(adc_tlv, -9750, 50, 1); 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" }, { "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 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; struct snd_soc_dapm_widget *w;
snd_soc_dapm_new_controls(dapm, wm8960_dapm_widgets, 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 * list each time to find the desired power state do so now
* and save the result. * 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) if (w->dapm != dapm)
continue; continue;
if (strcmp(w->name, "LOUT1 PGA") == 0) 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, static int wm8960_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
u16 iface = 0; u16 iface = 0;
/* set master/slave audio interface */ /* set master/slave audio interface */
@ -573,7 +573,7 @@ static int wm8960_set_dai_fmt(struct snd_soc_dai *codec_dai,
} }
/* set iface */ /* set iface */
snd_soc_write(codec, WM8960_IFACE1, iface); snd_soc_component_write(component, WM8960_IFACE1, iface);
return 0; 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 * triplet, we relax the bclk such that bclk is chosen as the
* closest available frequency greater than expected bclk. * closest available frequency greater than expected bclk.
* *
* @codec: codec structure * @component: component structure
* @freq_in: input frequency used to derive freq out via PLL * @freq_in: input frequency used to derive freq out via PLL
* @sysclk_idx: sysclk_divs index for found sysclk * @sysclk_idx: sysclk_divs index for found sysclk
* @dac_idx: dac_divs index for found lrclk * @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 * (@sysclk_idx, @dac_idx, @bclk_idx) dividers
*/ */
static 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) 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 sysclk, bclk, lrclk, freq_out;
int diff, closest, best_freq_out; int diff, closest, best_freq_out;
int i, j, k; int i, j, k;
@ -741,22 +741,22 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
return best_freq_out; 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; 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 i, j, k;
int ret; int ret;
if (!(iface1 & (1<<6))) { if (!(iface1 & (1<<6))) {
dev_dbg(codec->dev, dev_dbg(component->dev,
"Codec is slave mode, no need to configure clock\n"); "Codec is slave mode, no need to configure clock\n");
return 0; return 0;
} }
if (wm8960->clk_id != WM8960_SYSCLK_MCLK && !wm8960->freq_in) { 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; return -EINVAL;
} }
@ -769,12 +769,12 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
*/ */
if (wm8960->clk_id == WM8960_SYSCLK_AUTO) { if (wm8960->clk_id == WM8960_SYSCLK_AUTO) {
/* disable the PLL and using MCLK to provide sysclk */ /* 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; freq_out = freq_in;
} else if (wm8960->sysclk) { } else if (wm8960->sysclk) {
freq_out = wm8960->sysclk; freq_out = wm8960->sysclk;
} else { } else {
dev_err(codec->dev, "No SYSCLK configured\n"); dev_err(component->dev, "No SYSCLK configured\n");
return -EINVAL; return -EINVAL;
} }
@ -783,28 +783,28 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
if (ret >= 0) { if (ret >= 0) {
goto configure_clock; goto configure_clock;
} else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) { } 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; 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) { 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; return freq_out;
} }
wm8960_set_pll(codec, freq_in, freq_out); wm8960_set_pll(component, freq_in, freq_out);
configure_clock: configure_clock:
/* configure sysclk 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 */ /* configure frame clock */
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x7 << 3, j << 3); snd_soc_component_update_bits(component, 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 << 6, j << 6);
/* configure bit clock */ /* configure bit clock */
snd_soc_update_bits(codec, WM8960_CLOCK2, 0xf, k); snd_soc_component_update_bits(component, WM8960_CLOCK2, 0xf, k);
return 0; return 0;
} }
@ -813,9 +813,9 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
u16 iface = snd_soc_read(codec, WM8960_IFACE1) & 0xfff3; u16 iface = snd_soc_component_read32(component, WM8960_IFACE1) & 0xfff3;
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
int i; int i;
@ -840,7 +840,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
break; break;
} }
default: default:
dev_err(codec->dev, "unsupported width %d\n", dev_err(component->dev, "unsupported width %d\n",
params_width(params)); params_width(params));
return -EINVAL; return -EINVAL;
} }
@ -848,23 +848,23 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
wm8960->lrclk = params_rate(params); wm8960->lrclk = params_rate(params);
/* Update filters for the new rate */ /* Update filters for the new rate */
if (tx) { if (tx) {
wm8960_set_deemph(codec); wm8960_set_deemph(component);
} else { } else {
for (i = 0; i < ARRAY_SIZE(alc_rates); i++) for (i = 0; i < ARRAY_SIZE(alc_rates); i++)
if (alc_rates[i].rate == params_rate(params)) if (alc_rates[i].rate == params_rate(params))
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
WM8960_ADDCTL3, 0x7, WM8960_ADDCTL3, 0x7,
alc_rates[i].val); alc_rates[i].val);
} }
/* set iface */ /* set iface */
snd_soc_write(codec, WM8960_IFACE1, iface); snd_soc_component_write(component, WM8960_IFACE1, iface);
wm8960->is_stream_in_use[tx] = true; 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]) !wm8960->is_stream_in_use[!tx])
return wm8960_configure_clocking(codec); return wm8960_configure_clocking(component);
return 0; 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, static int wm8960_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
wm8960->is_stream_in_use[tx] = false; 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) 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) if (mute)
snd_soc_update_bits(codec, WM8960_DACCTL1, 0x8, 0x8); snd_soc_component_update_bits(component, WM8960_DACCTL1, 0x8, 0x8);
else else
snd_soc_update_bits(codec, WM8960_DACCTL1, 0x8, 0); snd_soc_component_update_bits(component, WM8960_DACCTL1, 0x8, 0);
return 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) 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);
u16 pm2 = snd_soc_read(codec, WM8960_POWER2); u16 pm2 = snd_soc_component_read32(component, WM8960_POWER2);
int ret; int ret;
switch (level) { switch (level) {
@ -904,24 +904,24 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_PREPARE: 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: case SND_SOC_BIAS_STANDBY:
if (!IS_ERR(wm8960->mclk)) { if (!IS_ERR(wm8960->mclk)) {
ret = clk_prepare_enable(wm8960->mclk); ret = clk_prepare_enable(wm8960->mclk);
if (ret) { if (ret) {
dev_err(codec->dev, dev_err(component->dev,
"Failed to enable MCLK: %d\n", "Failed to enable MCLK: %d\n",
ret); ret);
return ret; return ret;
} }
} }
ret = wm8960_configure_clocking(codec); ret = wm8960_configure_clocking(component);
if (ret) if (ret)
return ret; return ret;
/* Set VMID to 2x50k */ /* Set VMID to 2x50k */
snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x80); snd_soc_component_update_bits(component, WM8960_POWER1, 0x180, 0x80);
break; break;
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
@ -930,7 +930,7 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
* disable the pll * disable the pll
*/ */
if (wm8960->clk_id == WM8960_SYSCLK_AUTO && (pm2 & 0x1)) 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)) if (!IS_ERR(wm8960->mclk))
clk_disable_unprepare(wm8960->mclk); clk_disable_unprepare(wm8960->mclk);
@ -943,38 +943,38 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
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) {
regcache_sync(wm8960->regmap); regcache_sync(wm8960->regmap);
/* Enable anti-pop features */ /* Enable anti-pop features */
snd_soc_write(codec, WM8960_APOP1, snd_soc_component_write(component, WM8960_APOP1,
WM8960_POBCTRL | WM8960_SOFT_ST | WM8960_POBCTRL | WM8960_SOFT_ST |
WM8960_BUFDCOPEN | WM8960_BUFIOEN); WM8960_BUFDCOPEN | WM8960_BUFIOEN);
/* Enable & ramp VMID at 2x50k */ /* 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); msleep(100);
/* Enable VREF */ /* Enable VREF */
snd_soc_update_bits(codec, WM8960_POWER1, WM8960_VREF, snd_soc_component_update_bits(component, WM8960_POWER1, WM8960_VREF,
WM8960_VREF); WM8960_VREF);
/* Disable anti-pop features */ /* 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 */ /* Set VMID to 2x250k */
snd_soc_update_bits(codec, WM8960_POWER1, 0x180, 0x100); snd_soc_component_update_bits(component, WM8960_POWER1, 0x180, 0x100);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
/* Enable anti-pop features */ /* Enable anti-pop features */
snd_soc_write(codec, WM8960_APOP1, snd_soc_component_write(component, WM8960_APOP1,
WM8960_POBCTRL | WM8960_SOFT_ST | WM8960_POBCTRL | WM8960_SOFT_ST |
WM8960_BUFDCOPEN | WM8960_BUFIOEN); WM8960_BUFDCOPEN | WM8960_BUFIOEN);
/* Disable VMID and VREF, let them discharge */ /* Disable VMID and VREF, let them discharge */
snd_soc_write(codec, WM8960_POWER1, 0); snd_soc_component_write(component, WM8960_POWER1, 0);
msleep(600); msleep(600);
break; break;
} }
@ -982,11 +982,11 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
return 0; 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) 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);
u16 pm2 = snd_soc_read(codec, WM8960_POWER2); u16 pm2 = snd_soc_component_read32(component, WM8960_POWER2);
int reg, ret; int reg, ret;
switch (level) { switch (level) {
@ -994,10 +994,10 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_PREPARE: 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: case SND_SOC_BIAS_STANDBY:
/* Enable anti pop mode */ /* 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_POBCTRL | WM8960_SOFT_ST |
WM8960_BUFDCOPEN, WM8960_BUFDCOPEN,
WM8960_POBCTRL | WM8960_SOFT_ST | 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; reg |= WM8960_PWR2_ROUT1;
if (wm8960->out3 && wm8960->out3->power) if (wm8960->out3 && wm8960->out3->power)
reg |= WM8960_PWR2_OUT3; reg |= WM8960_PWR2_OUT3;
snd_soc_update_bits(codec, WM8960_POWER2, snd_soc_component_update_bits(component, WM8960_POWER2,
WM8960_PWR2_LOUT1 | WM8960_PWR2_LOUT1 |
WM8960_PWR2_ROUT1 | WM8960_PWR2_ROUT1 |
WM8960_PWR2_OUT3, reg); WM8960_PWR2_OUT3, reg);
/* Enable VMID at 2*50k */ /* Enable VMID at 2*50k */
snd_soc_update_bits(codec, WM8960_POWER1, snd_soc_component_update_bits(component, WM8960_POWER1,
WM8960_VMID_MASK, 0x80); WM8960_VMID_MASK, 0x80);
/* Ramp */ /* Ramp */
msleep(100); msleep(100);
/* Enable VREF */ /* Enable VREF */
snd_soc_update_bits(codec, WM8960_POWER1, snd_soc_component_update_bits(component, WM8960_POWER1,
WM8960_VREF, WM8960_VREF); WM8960_VREF, WM8960_VREF);
msleep(100); msleep(100);
@ -1032,14 +1032,14 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
if (!IS_ERR(wm8960->mclk)) { if (!IS_ERR(wm8960->mclk)) {
ret = clk_prepare_enable(wm8960->mclk); ret = clk_prepare_enable(wm8960->mclk);
if (ret) { if (ret) {
dev_err(codec->dev, dev_err(component->dev,
"Failed to enable MCLK: %d\n", "Failed to enable MCLK: %d\n",
ret); ret);
return ret; return ret;
} }
} }
ret = wm8960_configure_clocking(codec); ret = wm8960_configure_clocking(component);
if (ret) if (ret)
return ret; return ret;
@ -1051,20 +1051,20 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
* disable the pll * disable the pll
*/ */
if (wm8960->clk_id == WM8960_SYSCLK_AUTO && (pm2 & 0x1)) 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)) if (!IS_ERR(wm8960->mclk))
clk_disable_unprepare(wm8960->mclk); clk_disable_unprepare(wm8960->mclk);
/* Enable anti-pop mode */ /* 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_POBCTRL | WM8960_SOFT_ST |
WM8960_BUFDCOPEN, WM8960_BUFDCOPEN,
WM8960_POBCTRL | WM8960_SOFT_ST | WM8960_POBCTRL | WM8960_SOFT_ST |
WM8960_BUFDCOPEN); WM8960_BUFDCOPEN);
/* Disable VMID and VREF */ /* 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); WM8960_VREF | WM8960_VMID_MASK, 0);
break; break;
@ -1077,15 +1077,15 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_STANDBY: 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: case SND_SOC_BIAS_PREPARE:
/* Disable HP discharge */ /* Disable HP discharge */
snd_soc_update_bits(codec, WM8960_APOP2, snd_soc_component_update_bits(component, WM8960_APOP2,
WM8960_DISOP | WM8960_DRES_MASK, WM8960_DISOP | WM8960_DRES_MASK,
0); 0);
/* Disable anti-pop features */ /* 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_POBCTRL | WM8960_SOFT_ST |
WM8960_BUFDCOPEN, WM8960_BUFDCOPEN,
WM8960_POBCTRL | WM8960_SOFT_ST | WM8960_POBCTRL | WM8960_SOFT_ST |
@ -1184,7 +1184,7 @@ static int pll_factors(unsigned int source, unsigned int target,
return 0; 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) unsigned int freq_in, unsigned int freq_out)
{ {
u16 reg; 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 /* Disable the PLL: even if we are changing the frequency the
* PLL needs to be disabled while we do so. */ * PLL needs to be disabled while we do so. */
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x1, 0); snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x1, 0);
snd_soc_update_bits(codec, WM8960_POWER2, 0x1, 0); snd_soc_component_update_bits(component, WM8960_POWER2, 0x1, 0);
if (!freq_in || !freq_out) if (!freq_in || !freq_out)
return 0; 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.pre_div << 4;
reg |= pll_div.n; reg |= pll_div.n;
if (pll_div.k) { if (pll_div.k) {
reg |= 0x20; reg |= 0x20;
snd_soc_write(codec, WM8960_PLL2, (pll_div.k >> 16) & 0xff); snd_soc_component_write(component, WM8960_PLL2, (pll_div.k >> 16) & 0xff);
snd_soc_write(codec, WM8960_PLL3, (pll_div.k >> 8) & 0xff); snd_soc_component_write(component, WM8960_PLL3, (pll_div.k >> 8) & 0xff);
snd_soc_write(codec, WM8960_PLL4, pll_div.k & 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 */ /* Turn it on */
snd_soc_update_bits(codec, WM8960_POWER2, 0x1, 0x1); snd_soc_component_update_bits(component, WM8960_POWER2, 0x1, 0x1);
msleep(250); msleep(250);
snd_soc_update_bits(codec, WM8960_CLOCK1, 0x1, 0x1); snd_soc_component_update_bits(component, WM8960_CLOCK1, 0x1, 0x1);
return 0; 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, 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) 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 wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
wm8960->freq_in = freq_in; wm8960->freq_in = freq_in;
if (pll_id == WM8960_SYSCLK_AUTO) if (pll_id == WM8960_SYSCLK_AUTO)
return 0; 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, static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
u16 reg; u16 reg;
switch (div_id) { switch (div_id) {
case WM8960_SYSCLKDIV: case WM8960_SYSCLKDIV:
reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1f9; reg = snd_soc_component_read32(component, WM8960_CLOCK1) & 0x1f9;
snd_soc_write(codec, WM8960_CLOCK1, reg | div); snd_soc_component_write(component, WM8960_CLOCK1, reg | div);
break; break;
case WM8960_DACDIV: case WM8960_DACDIV:
reg = snd_soc_read(codec, WM8960_CLOCK1) & 0x1c7; reg = snd_soc_component_read32(component, WM8960_CLOCK1) & 0x1c7;
snd_soc_write(codec, WM8960_CLOCK1, reg | div); snd_soc_component_write(component, WM8960_CLOCK1, reg | div);
break; break;
case WM8960_OPCLKDIV: case WM8960_OPCLKDIV:
reg = snd_soc_read(codec, WM8960_PLL1) & 0x03f; reg = snd_soc_component_read32(component, WM8960_PLL1) & 0x03f;
snd_soc_write(codec, WM8960_PLL1, reg | div); snd_soc_component_write(component, WM8960_PLL1, reg | div);
break; break;
case WM8960_DCLKDIV: case WM8960_DCLKDIV:
reg = snd_soc_read(codec, WM8960_CLOCK2) & 0x03f; reg = snd_soc_component_read32(component, WM8960_CLOCK2) & 0x03f;
snd_soc_write(codec, WM8960_CLOCK2, reg | div); snd_soc_component_write(component, WM8960_CLOCK2, reg | div);
break; break;
case WM8960_TOCLKSEL: case WM8960_TOCLKSEL:
reg = snd_soc_read(codec, WM8960_ADDCTL1) & 0x1fd; reg = snd_soc_component_read32(component, WM8960_ADDCTL1) & 0x1fd;
snd_soc_write(codec, WM8960_ADDCTL1, reg | div); snd_soc_component_write(component, WM8960_ADDCTL1, reg | div);
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -1274,27 +1274,27 @@ static int wm8960_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
return 0; 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) 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, static int wm8960_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
unsigned int freq, int dir) unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case WM8960_SYSCLK_MCLK: case WM8960_SYSCLK_MCLK:
snd_soc_update_bits(codec, WM8960_CLOCK1, snd_soc_component_update_bits(component, WM8960_CLOCK1,
0x1, WM8960_SYSCLK_MCLK); 0x1, WM8960_SYSCLK_MCLK);
break; break;
case WM8960_SYSCLK_PLL: case WM8960_SYSCLK_PLL:
snd_soc_update_bits(codec, WM8960_CLOCK1, snd_soc_component_update_bits(component, WM8960_CLOCK1,
0x1, WM8960_SYSCLK_PLL); 0x1, WM8960_SYSCLK_PLL);
break; break;
case WM8960_SYSCLK_AUTO: case WM8960_SYSCLK_AUTO:
@ -1343,9 +1343,9 @@ static struct snd_soc_dai_driver wm8960_dai = {
.symmetric_rates = 1, .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; struct wm8960_data *pdata = &wm8960->pdata;
if (pdata->capless) if (pdata->capless)
@ -1353,17 +1353,21 @@ static int wm8960_probe(struct snd_soc_codec *codec)
else else
wm8960->set_bias_level = wm8960_set_bias_level_out3; 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)); ARRAY_SIZE(wm8960_snd_controls));
wm8960_add_widgets(codec); wm8960_add_widgets(component);
return 0; return 0;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8960 = { static const struct snd_soc_component_driver soc_component_dev_wm8960 = {
.probe = wm8960_probe, .probe = wm8960_probe,
.set_bias_level = wm8960_set_bias_level, .set_bias_level = wm8960_set_bias_level,
.suspend_bias_off = true, .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 = { 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); i2c_set_clientdata(i2c, wm8960);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8960, &wm8960_dai, 1); &soc_component_dev_wm8960, &wm8960_dai, 1);
return ret; return ret;
} }
static int wm8960_i2c_remove(struct i2c_client *client) static int wm8960_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_codec(&client->dev);
return 0; return 0;
} }