Skip to content

L
linux
Commit 179ef216 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branches 'asoc/topic/wm8728', 'asoc/topic/wm8731',... 

Merge remote-tracking branches 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8737', 'asoc/topic/wm8741' and 'asoc/topic/wm8750' into asoc-next
parents 3b04e29f 6b413080 cde596c7 840680dc 9b6a00f7 f081a227
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 299 deletions
sound/soc/codecs/wm8728.c
View file @ 179ef216
...@@ -74,13 +74,13 @@ static const struct snd_soc_dapm_route wm8728_intercon[] = { ...@@ -74,13 +74,13 @@ static const struct snd_soc_dapm_route wm8728_intercon[] = {
static int wm8728_mute(struct snd_soc_dai *dai, int mute) static int wm8728_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u16 mute_reg = snd_soc_read(codec, WM8728_DACCTL); u16 mute_reg = snd_soc_component_read32(component, WM8728_DACCTL);
if (mute) if (mute)
snd_soc_write(codec, WM8728_DACCTL, mute_reg | 1); snd_soc_component_write(component, WM8728_DACCTL, mute_reg | 1);
else else
snd_soc_write(codec, WM8728_DACCTL, mute_reg & ~1); snd_soc_component_write(component, WM8728_DACCTL, mute_reg & ~1);
return 0; return 0;
} }
...@@ -89,8 +89,8 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream, ...@@ -89,8 +89,8 @@ static int wm8728_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;
u16 dac = snd_soc_read(codec, WM8728_DACCTL); u16 dac = snd_soc_component_read32(component, WM8728_DACCTL);
dac &= ~0x18; dac &= ~0x18;
...@@ -107,7 +107,7 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream, ...@@ -107,7 +107,7 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_write(codec, WM8728_DACCTL, dac); snd_soc_component_write(component, WM8728_DACCTL, dac);
return 0; return 0;
} }
...@@ -115,8 +115,8 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream, ...@@ -115,8 +115,8 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream,
static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai, static int wm8728_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 = snd_soc_read(codec, WM8728_IFCTL); u16 iface = snd_soc_component_read32(component, WM8728_IFCTL);
/* Currently only I2S is supported by the driver, though the /* Currently only I2S is supported by the driver, though the
* hardware is more flexible. * hardware is more flexible.
...@@ -156,24 +156,24 @@ static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -156,24 +156,24 @@ static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai,
return -EINVAL; return -EINVAL;
} }
snd_soc_write(codec, WM8728_IFCTL, iface); snd_soc_component_write(component, WM8728_IFCTL, iface);
return 0; return 0;
} }
static int wm8728_set_bias_level(struct snd_soc_codec *codec, static int wm8728_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8728_priv *wm8728 = snd_soc_codec_get_drvdata(codec); struct wm8728_priv *wm8728 = snd_soc_component_get_drvdata(component);
u16 reg; u16 reg;
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
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) {
/* Power everything up... */ /* Power everything up... */
reg = snd_soc_read(codec, WM8728_DACCTL); reg = snd_soc_component_read32(component, WM8728_DACCTL);
snd_soc_write(codec, WM8728_DACCTL, reg & ~0x4); snd_soc_component_write(component, WM8728_DACCTL, reg & ~0x4);
/* ..then sync in the register cache. */ /* ..then sync in the register cache. */
regcache_sync(wm8728->regmap); regcache_sync(wm8728->regmap);
...@@ -181,8 +181,8 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec, ...@@ -181,8 +181,8 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
reg = snd_soc_read(codec, WM8728_DACCTL); reg = snd_soc_component_read32(component, WM8728_DACCTL);
snd_soc_write(codec, WM8728_DACCTL, reg | 0x4); snd_soc_component_write(component, WM8728_DACCTL, reg | 0x4);
break; break;
} }
return 0; return 0;
...@@ -211,18 +211,19 @@ static struct snd_soc_dai_driver wm8728_dai = { ...@@ -211,18 +211,19 @@ static struct snd_soc_dai_driver wm8728_dai = {
.ops = &wm8728_dai_ops, .ops = &wm8728_dai_ops,
}; };
static const struct snd_soc_codec_driver soc_codec_dev_wm8728 = { static const struct snd_soc_component_driver soc_component_dev_wm8728 = {
.set_bias_level = wm8728_set_bias_level, .set_bias_level = wm8728_set_bias_level,
.suspend_bias_off = true, .controls = wm8728_snd_controls,
.num_controls = ARRAY_SIZE(wm8728_snd_controls),
.component_driver = { .dapm_widgets = wm8728_dapm_widgets,
.controls = wm8728_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8728_snd_controls), .dapm_routes = wm8728_intercon,
.dapm_widgets = wm8728_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8728_intercon),
.num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = wm8728_intercon, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(wm8728_intercon), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct of_device_id wm8728_of_match[] = { static const struct of_device_id wm8728_of_match[] = {
...@@ -258,26 +259,18 @@ static int wm8728_spi_probe(struct spi_device *spi) ...@@ -258,26 +259,18 @@ static int wm8728_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, wm8728); spi_set_drvdata(spi, wm8728);
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_wm8728, &wm8728_dai, 1); &soc_component_dev_wm8728, &wm8728_dai, 1);
return ret; return ret;
} }
static int wm8728_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
}
static struct spi_driver wm8728_spi_driver = { static struct spi_driver wm8728_spi_driver = {
.driver = { .driver = {
.name = "wm8728", .name = "wm8728",
.of_match_table = wm8728_of_match, .of_match_table = wm8728_of_match,
}, },
.probe = wm8728_spi_probe, .probe = wm8728_spi_probe,
.remove = wm8728_spi_remove,
}; };
#endif /* CONFIG_SPI_MASTER */ #endif /* CONFIG_SPI_MASTER */
...@@ -299,18 +292,12 @@ static int wm8728_i2c_probe(struct i2c_client *i2c, ...@@ -299,18 +292,12 @@ static int wm8728_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8728); i2c_set_clientdata(i2c, wm8728);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8728, &wm8728_dai, 1); &soc_component_dev_wm8728, &wm8728_dai, 1);
return ret; return ret;
} }
static int wm8728_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id wm8728_i2c_id[] = { static const struct i2c_device_id wm8728_i2c_id[] = {
{ "wm8728", 0 }, { "wm8728", 0 },
{ } { }
...@@ -323,7 +310,6 @@ static struct i2c_driver wm8728_i2c_driver = { ...@@ -323,7 +310,6 @@ static struct i2c_driver wm8728_i2c_driver = {
.of_match_table = wm8728_of_match, .of_match_table = wm8728_of_match,
}, },
.probe = wm8728_i2c_probe, .probe = wm8728_i2c_probe,
.remove = wm8728_i2c_remove,
.id_table = wm8728_i2c_id, .id_table = wm8728_i2c_id,
}; };
#endif #endif
......
sound/soc/codecs/wm8731.c
View file @ 179ef216
...@@ -88,9 +88,9 @@ static SOC_ENUM_SINGLE_DECL(wm8731_insel_enum, ...@@ -88,9 +88,9 @@ static SOC_ENUM_SINGLE_DECL(wm8731_insel_enum,
static int wm8731_deemph[] = { 0, 32000, 44100, 48000 }; static int wm8731_deemph[] = { 0, 32000, 44100, 48000 };
static int wm8731_set_deemph(struct snd_soc_codec *codec) static int wm8731_set_deemph(struct snd_soc_component *component)
{ {
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = 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
...@@ -110,17 +110,17 @@ static int wm8731_set_deemph(struct snd_soc_codec *codec) ...@@ -110,17 +110,17 @@ static int wm8731_set_deemph(struct snd_soc_codec *codec)
val = 0; val = 0;
} }
dev_dbg(codec->dev, "Set deemphasis %d (%dHz)\n", dev_dbg(component->dev, "Set deemphasis %d (%dHz)\n",
best, wm8731_deemph[best]); best, wm8731_deemph[best]);
return snd_soc_update_bits(codec, WM8731_APDIGI, 0x6, val); return snd_soc_component_update_bits(component, WM8731_APDIGI, 0x6, val);
} }
static int wm8731_get_deemph(struct snd_kcontrol *kcontrol, static int wm8731_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 wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = wm8731->deemph; ucontrol->value.integer.value[0] = wm8731->deemph;
...@@ -130,8 +130,8 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol, ...@@ -130,8 +130,8 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
static int wm8731_put_deemph(struct snd_kcontrol *kcontrol, static int wm8731_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 wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
unsigned int deemph = ucontrol->value.integer.value[0]; unsigned int deemph = ucontrol->value.integer.value[0];
int ret = 0; int ret = 0;
...@@ -142,7 +142,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol, ...@@ -142,7 +142,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
if (wm8731->deemph != deemph) { if (wm8731->deemph != deemph) {
wm8731->deemph = deemph; wm8731->deemph = deemph;
wm8731_set_deemph(codec); wm8731_set_deemph(component);
ret = 1; ret = 1;
} }
...@@ -214,8 +214,8 @@ SND_SOC_DAPM_INPUT("LLINEIN"), ...@@ -214,8 +214,8 @@ SND_SOC_DAPM_INPUT("LLINEIN"),
static int wm8731_check_osc(struct snd_soc_dapm_widget *source, static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
return wm8731->sysclk_type == WM8731_SYSCLK_XTAL; return wm8731->sysclk_type == WM8731_SYSCLK_XTAL;
} }
...@@ -337,16 +337,16 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream, ...@@ -337,16 +337,16 @@ static int wm8731_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 wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
u16 iface = snd_soc_read(codec, WM8731_IFACE) & 0xfff3; u16 iface = snd_soc_component_read32(component, WM8731_IFACE) & 0xfff3;
int i = get_coeff(wm8731->sysclk, params_rate(params)); int i = get_coeff(wm8731->sysclk, params_rate(params));
u16 srate = (coeff_div[i].sr << 2) | u16 srate = (coeff_div[i].sr << 2) |
(coeff_div[i].bosr << 1) | coeff_div[i].usb; (coeff_div[i].bosr << 1) | coeff_div[i].usb;
wm8731->playback_fs = params_rate(params); wm8731->playback_fs = params_rate(params);
snd_soc_write(codec, WM8731_SRATE, srate); snd_soc_component_write(component, WM8731_SRATE, srate);
/* bit size */ /* bit size */
switch (params_width(params)) { switch (params_width(params)) {
...@@ -363,30 +363,30 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream, ...@@ -363,30 +363,30 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,
break; break;
} }
wm8731_set_deemph(codec); wm8731_set_deemph(component);
snd_soc_write(codec, WM8731_IFACE, iface); snd_soc_component_write(component, WM8731_IFACE, iface);
return 0; return 0;
} }
static int wm8731_mute(struct snd_soc_dai *dai, int mute) static int wm8731_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u16 mute_reg = snd_soc_read(codec, WM8731_APDIGI) & 0xfff7; u16 mute_reg = snd_soc_component_read32(component, WM8731_APDIGI) & 0xfff7;
if (mute) if (mute)
snd_soc_write(codec, WM8731_APDIGI, mute_reg | 0x8); snd_soc_component_write(component, WM8731_APDIGI, mute_reg | 0x8);
else else
snd_soc_write(codec, WM8731_APDIGI, mute_reg); snd_soc_component_write(component, WM8731_APDIGI, mute_reg);
return 0; return 0;
} }
static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->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);
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case WM8731_SYSCLK_XTAL: case WM8731_SYSCLK_XTAL:
...@@ -429,7 +429,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -429,7 +429,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai, static int wm8731_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 */
...@@ -481,14 +481,14 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -481,14 +481,14 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
} }
/* set iface */ /* set iface */
snd_soc_write(codec, WM8731_IFACE, iface); snd_soc_component_write(component, WM8731_IFACE, iface);
return 0; return 0;
} }
static int wm8731_set_bias_level(struct snd_soc_codec *codec, static int wm8731_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(component);
int ret; int ret;
u16 reg; u16 reg;
...@@ -503,7 +503,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, ...@@ -503,7 +503,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
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(wm8731->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies),
wm8731->supplies); wm8731->supplies);
if (ret != 0) if (ret != 0)
...@@ -513,13 +513,13 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, ...@@ -513,13 +513,13 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
} }
/* Clear PWROFF, gate CLKOUT, everything else as-is */ /* Clear PWROFF, gate CLKOUT, everything else as-is */
reg = snd_soc_read(codec, WM8731_PWR) & 0xff7f; reg = snd_soc_component_read32(component, WM8731_PWR) & 0xff7f;
snd_soc_write(codec, WM8731_PWR, reg | 0x0040); snd_soc_component_write(component, WM8731_PWR, reg | 0x0040);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
if (wm8731->mclk) if (wm8731->mclk)
clk_disable_unprepare(wm8731->mclk); clk_disable_unprepare(wm8731->mclk);
snd_soc_write(codec, WM8731_PWR, 0xffff); snd_soc_component_write(component, WM8731_PWR, 0xffff);
regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
wm8731->supplies); wm8731->supplies);
regcache_mark_dirty(wm8731->regmap); regcache_mark_dirty(wm8731->regmap);
...@@ -531,7 +531,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, ...@@ -531,7 +531,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
static int wm8731_startup(struct snd_pcm_substream *substream, static int wm8731_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(dai->codec); struct wm8731_priv *wm8731 = snd_soc_component_get_drvdata(dai->component);
if (wm8731->constraints) if (wm8731->constraints)
snd_pcm_hw_constraint_list(substream->runtime, 0, snd_pcm_hw_constraint_list(substream->runtime, 0,
...@@ -628,18 +628,19 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731) ...@@ -628,18 +628,19 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731)
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8731 = { static const struct snd_soc_component_driver soc_component_dev_wm8731 = {
.set_bias_level = wm8731_set_bias_level, .set_bias_level = wm8731_set_bias_level,
.suspend_bias_off = true, .controls = wm8731_snd_controls,
.num_controls = ARRAY_SIZE(wm8731_snd_controls),
.component_driver = { .dapm_widgets = wm8731_dapm_widgets,
.controls = wm8731_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8731_snd_controls), .dapm_routes = wm8731_intercon,
.dapm_widgets = wm8731_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = wm8731_intercon, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(wm8731_intercon), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct of_device_id wm8731_of_match[] = { static const struct of_device_id wm8731_of_match[] = {
...@@ -704,8 +705,8 @@ static int wm8731_spi_probe(struct spi_device *spi) ...@@ -704,8 +705,8 @@ static int wm8731_spi_probe(struct spi_device *spi)
if (ret != 0) if (ret != 0)
return ret; return ret;
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_wm8731, &wm8731_dai, 1); &soc_component_dev_wm8731, &wm8731_dai, 1);
if (ret != 0) { if (ret != 0) {
dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret); dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret);
return ret; return ret;
...@@ -716,7 +717,6 @@ static int wm8731_spi_probe(struct spi_device *spi) ...@@ -716,7 +717,6 @@ static int wm8731_spi_probe(struct spi_device *spi)
static int wm8731_spi_remove(struct spi_device *spi) static int wm8731_spi_remove(struct spi_device *spi)
{ {
snd_soc_unregister_codec(&spi->dev);
return 0; return 0;
} }
...@@ -775,8 +775,8 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, ...@@ -775,8 +775,8 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
if (ret != 0) if (ret != 0)
return ret; return ret;
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8731, &wm8731_dai, 1); &soc_component_dev_wm8731, &wm8731_dai, 1);
if (ret != 0) { if (ret != 0) {
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
return ret; return ret;
...@@ -787,7 +787,6 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, ...@@ -787,7 +787,6 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
static int wm8731_i2c_remove(struct i2c_client *client) static int wm8731_i2c_remove(struct i2c_client *client)
{ {
snd_soc_unregister_codec(&client->dev);
return 0; return 0;
} }
......
sound/soc/codecs/wm8737.c
View file @ 179ef216
...@@ -74,9 +74,9 @@ static bool wm8737_volatile(struct device *dev, unsigned int reg) ...@@ -74,9 +74,9 @@ static bool wm8737_volatile(struct device *dev, unsigned int reg)
} }
} }
static int wm8737_reset(struct snd_soc_codec *codec) static int wm8737_reset(struct snd_soc_component *component)
{ {
return snd_soc_write(codec, WM8737_RESET, 0); return snd_soc_component_write(component, WM8737_RESET, 0);
} }
static const DECLARE_TLV_DB_RANGE(micboost_tlv, static const DECLARE_TLV_DB_RANGE(micboost_tlv,
...@@ -328,8 +328,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream, ...@@ -328,8 +328,8 @@ static int wm8737_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 wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
int i; int i;
u16 clocking = 0; u16 clocking = 0;
u16 af = 0; u16 af = 0;
...@@ -348,7 +348,7 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream, ...@@ -348,7 +348,7 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream,
} }
if (i == ARRAY_SIZE(coeff_div)) { if (i == ARRAY_SIZE(coeff_div)) {
dev_err(codec->dev, "%dHz MCLK can't support %dHz\n", dev_err(component->dev, "%dHz MCLK can't support %dHz\n",
wm8737->mclk, params_rate(params)); wm8737->mclk, params_rate(params));
return -EINVAL; return -EINVAL;
} }
...@@ -371,8 +371,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream, ...@@ -371,8 +371,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8737_AUDIO_FORMAT, WM8737_WL_MASK, af); snd_soc_component_update_bits(component, WM8737_AUDIO_FORMAT, WM8737_WL_MASK, af);
snd_soc_update_bits(codec, WM8737_CLOCKING, snd_soc_component_update_bits(component, WM8737_CLOCKING,
WM8737_USB_MODE | WM8737_CLKDIV2 | WM8737_SR_MASK, WM8737_USB_MODE | WM8737_CLKDIV2 | WM8737_SR_MASK,
clocking); clocking);
...@@ -382,8 +382,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream, ...@@ -382,8 +382,8 @@ static int wm8737_hw_params(struct snd_pcm_substream *substream,
static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
int i; int i;
for (i = 0; i < ARRAY_SIZE(coeff_div); i++) { for (i = 0; i < ARRAY_SIZE(coeff_div); i++) {
...@@ -394,7 +394,7 @@ static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -394,7 +394,7 @@ static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai,
} }
} }
dev_err(codec->dev, "MCLK rate %dHz not supported\n", freq); dev_err(component->dev, "MCLK rate %dHz not supported\n", freq);
return -EINVAL; return -EINVAL;
} }
...@@ -403,7 +403,7 @@ static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -403,7 +403,7 @@ static int wm8737_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int wm8737_set_dai_fmt(struct snd_soc_dai *codec_dai, static int wm8737_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 af = 0; u16 af = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
...@@ -445,16 +445,16 @@ static int wm8737_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -445,16 +445,16 @@ static int wm8737_set_dai_fmt(struct snd_soc_dai *codec_dai,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8737_AUDIO_FORMAT, snd_soc_component_update_bits(component, WM8737_AUDIO_FORMAT,
WM8737_FORMAT_MASK | WM8737_LRP | WM8737_MS, af); WM8737_FORMAT_MASK | WM8737_LRP | WM8737_MS, af);
return 0; return 0;
} }
static int wm8737_set_bias_level(struct snd_soc_codec *codec, static int wm8737_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
...@@ -463,16 +463,16 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec, ...@@ -463,16 +463,16 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* VMID at 2*75k */ /* VMID at 2*75k */
snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL, snd_soc_component_update_bits(component, WM8737_MISC_BIAS_CONTROL,
WM8737_VMIDSEL_MASK, 0); WM8737_VMIDSEL_MASK, 0);
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(wm8737->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies),
wm8737->supplies); wm8737->supplies);
if (ret != 0) { if (ret != 0) {
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;
...@@ -481,12 +481,12 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec, ...@@ -481,12 +481,12 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
regcache_sync(wm8737->regmap); regcache_sync(wm8737->regmap);
/* Fast VMID ramp at 2*2.5k */ /* Fast VMID ramp at 2*2.5k */
snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL, snd_soc_component_update_bits(component, WM8737_MISC_BIAS_CONTROL,
WM8737_VMIDSEL_MASK, WM8737_VMIDSEL_MASK,
2 << WM8737_VMIDSEL_SHIFT); 2 << WM8737_VMIDSEL_SHIFT);
/* Bring VMID up */ /* Bring VMID up */
snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT, snd_soc_component_update_bits(component, WM8737_POWER_MANAGEMENT,
WM8737_VMID_MASK | WM8737_VMID_MASK |
WM8737_VREF_MASK, WM8737_VREF_MASK,
WM8737_VMID_MASK | WM8737_VMID_MASK |
...@@ -496,14 +496,14 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec, ...@@ -496,14 +496,14 @@ static int wm8737_set_bias_level(struct snd_soc_codec *codec,
} }
/* VMID at 2*300k */ /* VMID at 2*300k */
snd_soc_update_bits(codec, WM8737_MISC_BIAS_CONTROL, snd_soc_component_update_bits(component, WM8737_MISC_BIAS_CONTROL,
WM8737_VMIDSEL_MASK, WM8737_VMIDSEL_MASK,
1 << WM8737_VMIDSEL_SHIFT); 1 << WM8737_VMIDSEL_SHIFT);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_update_bits(codec, WM8737_POWER_MANAGEMENT, snd_soc_component_update_bits(component, WM8737_POWER_MANAGEMENT,
WM8737_VMID_MASK | WM8737_VREF_MASK, 0); WM8737_VMID_MASK | WM8737_VREF_MASK, 0);
regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies),
...@@ -537,30 +537,30 @@ static struct snd_soc_dai_driver wm8737_dai = { ...@@ -537,30 +537,30 @@ static struct snd_soc_dai_driver wm8737_dai = {
.ops = &wm8737_dai_ops, .ops = &wm8737_dai_ops,
}; };
static int wm8737_probe(struct snd_soc_codec *codec) static int wm8737_probe(struct snd_soc_component *component)
{ {
struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); struct wm8737_priv *wm8737 = snd_soc_component_get_drvdata(component);
int ret; int ret;
ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies),
wm8737->supplies); wm8737->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); dev_err(component->dev, "Failed to enable supplies: %d\n", ret);
goto err_get; goto err_get;
} }
ret = wm8737_reset(codec); ret = wm8737_reset(component);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset\n"); dev_err(component->dev, "Failed to issue reset\n");
goto err_enable; goto err_enable;
} }
snd_soc_update_bits(codec, WM8737_LEFT_PGA_VOLUME, WM8737_LVU, snd_soc_component_update_bits(component, WM8737_LEFT_PGA_VOLUME, WM8737_LVU,
WM8737_LVU); WM8737_LVU);
snd_soc_update_bits(codec, WM8737_RIGHT_PGA_VOLUME, WM8737_RVU, snd_soc_component_update_bits(component, WM8737_RIGHT_PGA_VOLUME, WM8737_RVU,
WM8737_RVU); WM8737_RVU);
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
/* Bias level configuration will have done an extra enable */ /* Bias level configuration will have done an extra enable */
regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);
...@@ -573,19 +573,20 @@ static int wm8737_probe(struct snd_soc_codec *codec) ...@@ -573,19 +573,20 @@ static int wm8737_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8737 = { static const struct snd_soc_component_driver soc_component_dev_wm8737 = {
.probe = wm8737_probe, .probe = wm8737_probe,
.set_bias_level = wm8737_set_bias_level, .set_bias_level = wm8737_set_bias_level,
.suspend_bias_off = true, .controls = wm8737_snd_controls,
.num_controls = ARRAY_SIZE(wm8737_snd_controls),
.component_driver = { .dapm_widgets = wm8737_dapm_widgets,
.controls = wm8737_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8737_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8737_snd_controls), .dapm_routes = intercon,
.dapm_widgets = wm8737_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(intercon),
.num_dapm_widgets = ARRAY_SIZE(wm8737_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = intercon, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(intercon), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct of_device_id wm8737_of_match[] = { static const struct of_device_id wm8737_of_match[] = {
...@@ -635,20 +636,13 @@ static int wm8737_i2c_probe(struct i2c_client *i2c, ...@@ -635,20 +636,13 @@ static int wm8737_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8737); i2c_set_clientdata(i2c, wm8737);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8737, &wm8737_dai, 1); &soc_component_dev_wm8737, &wm8737_dai, 1);
return ret; return ret;
} }
static int wm8737_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id wm8737_i2c_id[] = { static const struct i2c_device_id wm8737_i2c_id[] = {
{ "wm8737", 0 }, { "wm8737", 0 },
{ } { }
...@@ -661,7 +655,6 @@ static struct i2c_driver wm8737_i2c_driver = { ...@@ -661,7 +655,6 @@ static struct i2c_driver wm8737_i2c_driver = {
.of_match_table = wm8737_of_match, .of_match_table = wm8737_of_match,
}, },
.probe = wm8737_i2c_probe, .probe = wm8737_i2c_probe,
.remove = wm8737_i2c_remove,
.id_table = wm8737_i2c_id, .id_table = wm8737_i2c_id,
}; };
#endif #endif
...@@ -693,26 +686,18 @@ static int wm8737_spi_probe(struct spi_device *spi) ...@@ -693,26 +686,18 @@ static int wm8737_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, wm8737); spi_set_drvdata(spi, wm8737);
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_wm8737, &wm8737_dai, 1); &soc_component_dev_wm8737, &wm8737_dai, 1);
return ret; return ret;
} }
static int wm8737_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
}
static struct spi_driver wm8737_spi_driver = { static struct spi_driver wm8737_spi_driver = {
.driver = { .driver = {
.name = "wm8737", .name = "wm8737",
.of_match_table = wm8737_of_match, .of_match_table = wm8737_of_match,
}, },
.probe = wm8737_spi_probe, .probe = wm8737_spi_probe,
.remove = wm8737_spi_remove,
}; };
#endif /* CONFIG_SPI_MASTER */ #endif /* CONFIG_SPI_MASTER */
......
sound/soc/codecs/wm8741.c
View file @ 179ef216
This diff is collapsed.
sound/soc/codecs/wm8750.c
View file @ 179ef216
...@@ -86,7 +86,7 @@ struct wm8750_priv { ...@@ -86,7 +86,7 @@ struct wm8750_priv {
unsigned int sysclk; unsigned int sysclk;
}; };
#define wm8750_reset(c) snd_soc_write(c, WM8750_RESET, 0) #define wm8750_reset(c) snd_soc_component_write(c, WM8750_RESET, 0)
/* /*
* WM8750 Controls * WM8750 Controls
...@@ -502,8 +502,8 @@ static inline int get_coeff(int mclk, int rate) ...@@ -502,8 +502,8 @@ static inline int get_coeff(int mclk, int rate)
static int wm8750_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int wm8750_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec); struct wm8750_priv *wm8750 = snd_soc_component_get_drvdata(component);
switch (freq) { switch (freq) {
case 11289600: case 11289600:
...@@ -520,7 +520,7 @@ static int wm8750_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -520,7 +520,7 @@ static int wm8750_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int wm8750_set_dai_fmt(struct snd_soc_dai *codec_dai, static int wm8750_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 */
...@@ -571,7 +571,7 @@ static int wm8750_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -571,7 +571,7 @@ static int wm8750_set_dai_fmt(struct snd_soc_dai *codec_dai,
return -EINVAL; return -EINVAL;
} }
snd_soc_write(codec, WM8750_IFACE, iface); snd_soc_component_write(component, WM8750_IFACE, iface);
return 0; return 0;
} }
...@@ -579,10 +579,10 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -579,10 +579,10 @@ static int wm8750_pcm_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 wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec); struct wm8750_priv *wm8750 = snd_soc_component_get_drvdata(component);
u16 iface = snd_soc_read(codec, WM8750_IFACE) & 0x1f3; u16 iface = snd_soc_component_read32(component, WM8750_IFACE) & 0x1f3;
u16 srate = snd_soc_read(codec, WM8750_SRATE) & 0x1c0; u16 srate = snd_soc_component_read32(component, WM8750_SRATE) & 0x1c0;
int coeff = get_coeff(wm8750->sysclk, params_rate(params)); int coeff = get_coeff(wm8750->sysclk, params_rate(params));
/* bit size */ /* bit size */
...@@ -601,9 +601,9 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -601,9 +601,9 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream,
} }
/* set iface & srate */ /* set iface & srate */
snd_soc_write(codec, WM8750_IFACE, iface); snd_soc_component_write(component, WM8750_IFACE, iface);
if (coeff >= 0) if (coeff >= 0)
snd_soc_write(codec, WM8750_SRATE, srate | snd_soc_component_write(component, WM8750_SRATE, srate |
(coeff_div[coeff].sr << 1) | coeff_div[coeff].usb); (coeff_div[coeff].sr << 1) | coeff_div[coeff].usb);
return 0; return 0;
...@@ -611,44 +611,44 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -611,44 +611,44 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream,
static int wm8750_mute(struct snd_soc_dai *dai, int mute) static int wm8750_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u16 mute_reg = snd_soc_read(codec, WM8750_ADCDAC) & 0xfff7; u16 mute_reg = snd_soc_component_read32(component, WM8750_ADCDAC) & 0xfff7;
if (mute) if (mute)
snd_soc_write(codec, WM8750_ADCDAC, mute_reg | 0x8); snd_soc_component_write(component, WM8750_ADCDAC, mute_reg | 0x8);
else else
snd_soc_write(codec, WM8750_ADCDAC, mute_reg); snd_soc_component_write(component, WM8750_ADCDAC, mute_reg);
return 0; return 0;
} }
static int wm8750_set_bias_level(struct snd_soc_codec *codec, static int wm8750_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
u16 pwr_reg = snd_soc_read(codec, WM8750_PWR1) & 0xfe3e; u16 pwr_reg = snd_soc_component_read32(component, WM8750_PWR1) & 0xfe3e;
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
/* set vmid to 50k and unmute dac */ /* set vmid to 50k and unmute dac */
snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x00c0); snd_soc_component_write(component, WM8750_PWR1, pwr_reg | 0x00c0);
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
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) {
snd_soc_cache_sync(codec); snd_soc_component_cache_sync(component);
/* Set VMID to 5k */ /* Set VMID to 5k */
snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x01c1); snd_soc_component_write(component, WM8750_PWR1, pwr_reg | 0x01c1);
/* ...and ramp */ /* ...and ramp */
msleep(1000); msleep(1000);
} }
/* mute dac and set vmid to 500k, enable VREF */ /* mute dac and set vmid to 500k, enable VREF */
snd_soc_write(codec, WM8750_PWR1, pwr_reg | 0x0141); snd_soc_component_write(component, WM8750_PWR1, pwr_reg | 0x0141);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_write(codec, WM8750_PWR1, 0x0001); snd_soc_component_write(component, WM8750_PWR1, 0x0001);
break; break;
} }
return 0; return 0;
...@@ -685,42 +685,43 @@ static struct snd_soc_dai_driver wm8750_dai = { ...@@ -685,42 +685,43 @@ static struct snd_soc_dai_driver wm8750_dai = {
.ops = &wm8750_dai_ops, .ops = &wm8750_dai_ops,
}; };
static int wm8750_probe(struct snd_soc_codec *codec) static int wm8750_probe(struct snd_soc_component *component)
{ {
int ret; int ret;
ret = wm8750_reset(codec); ret = wm8750_reset(component);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "wm8750: failed to reset: %d\n", ret); printk(KERN_ERR "wm8750: failed to reset: %d\n", ret);
return ret; return ret;
} }
/* set the update bits */ /* set the update bits */
snd_soc_update_bits(codec, WM8750_LDAC, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_LDAC, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_RDAC, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_RDAC, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_LOUT1V, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_LOUT1V, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_ROUT1V, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_ROUT1V, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_LOUT2V, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_LOUT2V, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_ROUT2V, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_ROUT2V, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_LINVOL, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_LINVOL, 0x0100, 0x0100);
snd_soc_update_bits(codec, WM8750_RINVOL, 0x0100, 0x0100); snd_soc_component_update_bits(component, WM8750_RINVOL, 0x0100, 0x0100);
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8750 = { static const struct snd_soc_component_driver soc_component_dev_wm8750 = {
.probe = wm8750_probe, .probe = wm8750_probe,
.set_bias_level = wm8750_set_bias_level, .set_bias_level = wm8750_set_bias_level,
.suspend_bias_off = true, .controls = wm8750_snd_controls,
.num_controls = ARRAY_SIZE(wm8750_snd_controls),
.component_driver = { .dapm_widgets = wm8750_dapm_widgets,
.controls = wm8750_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8750_snd_controls), .dapm_routes = wm8750_dapm_routes,
.dapm_widgets = wm8750_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8750_dapm_routes),
.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = wm8750_dapm_routes, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(wm8750_dapm_routes), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct of_device_id wm8750_of_match[] = { static const struct of_device_id wm8750_of_match[] = {
...@@ -758,17 +759,11 @@ static int wm8750_spi_probe(struct spi_device *spi) ...@@ -758,17 +759,11 @@ static int wm8750_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, wm8750); spi_set_drvdata(spi, wm8750);
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_wm8750, &wm8750_dai, 1); &soc_component_dev_wm8750, &wm8750_dai, 1);
return ret; return ret;
} }
static int wm8750_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
}
static const struct spi_device_id wm8750_spi_ids[] = { static const struct spi_device_id wm8750_spi_ids[] = {
{ "wm8750", 0 }, { "wm8750", 0 },
{ "wm8987", 0 }, { "wm8987", 0 },
...@@ -783,7 +778,6 @@ static struct spi_driver wm8750_spi_driver = { ...@@ -783,7 +778,6 @@ static struct spi_driver wm8750_spi_driver = {
}, },
.id_table = wm8750_spi_ids, .id_table = wm8750_spi_ids,
.probe = wm8750_spi_probe, .probe = wm8750_spi_probe,
.remove = wm8750_spi_remove,
}; };
#endif /* CONFIG_SPI_MASTER */ #endif /* CONFIG_SPI_MASTER */
...@@ -806,17 +800,11 @@ static int wm8750_i2c_probe(struct i2c_client *i2c, ...@@ -806,17 +800,11 @@ static int wm8750_i2c_probe(struct i2c_client *i2c,
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return PTR_ERR(regmap); return PTR_ERR(regmap);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8750, &wm8750_dai, 1); &soc_component_dev_wm8750, &wm8750_dai, 1);
return ret; return ret;
} }
static int wm8750_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id wm8750_i2c_id[] = { static const struct i2c_device_id wm8750_i2c_id[] = {
{ "wm8750", 0 }, { "wm8750", 0 },
{ "wm8987", 0 }, { "wm8987", 0 },
...@@ -830,7 +818,6 @@ static struct i2c_driver wm8750_i2c_driver = { ...@@ -830,7 +818,6 @@ static struct i2c_driver wm8750_i2c_driver = {
.of_match_table = wm8750_of_match, .of_match_table = wm8750_of_match,
}, },
.probe = wm8750_i2c_probe, .probe = wm8750_i2c_probe,
.remove = wm8750_i2c_remove,
.id_table = wm8750_i2c_id, .id_table = wm8750_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