Skip to content

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

Merge remote-tracking branches 'asoc/topic/wm8753', 'asoc/topic/wm8770',... 

Merge remote-tracking branches 'asoc/topic/wm8753', 'asoc/topic/wm8770', 'asoc/topic/wm8776', 'asoc/topic/wm8782' and 'asoc/topic/wm8804' into asoc-next
parents 179ef216 22d15fc5 502cb3a2 51e42c95 d6ae5c16 cf73dce9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 344 deletions
sound/soc/codecs/wm8753.c
View file @ deb66f3f
This diff is collapsed.
sound/soc/codecs/wm8770.c
View file @ deb66f3f
This diff is collapsed.
sound/soc/codecs/wm8776.c
View file @ deb66f3f
...@@ -78,9 +78,9 @@ static bool wm8776_volatile(struct device *dev, unsigned int reg) ...@@ -78,9 +78,9 @@ static bool wm8776_volatile(struct device *dev, unsigned int reg)
} }
} }
static int wm8776_reset(struct snd_soc_codec *codec) static int wm8776_reset(struct snd_soc_component *component)
{ {
return snd_soc_write(codec, WM8776_RESET, 0); return snd_soc_component_write(component, WM8776_RESET, 0);
} }
static const DECLARE_TLV_DB_SCALE(hp_tlv, -12100, 100, 1); static const DECLARE_TLV_DB_SCALE(hp_tlv, -12100, 100, 1);
...@@ -166,7 +166,7 @@ static const struct snd_soc_dapm_route routes[] = { ...@@ -166,7 +166,7 @@ static const struct snd_soc_dapm_route routes[] = {
static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
int reg, iface, master; int reg, iface, master;
switch (dai->driver->id) { switch (dai->driver->id) {
...@@ -224,8 +224,8 @@ static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -224,8 +224,8 @@ static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
/* Finally, write out the values */ /* Finally, write out the values */
snd_soc_update_bits(codec, reg, 0xf, iface); snd_soc_component_update_bits(component, reg, 0xf, iface);
snd_soc_update_bits(codec, WM8776_MSTRCTRL, 0x180, master); snd_soc_component_update_bits(component, WM8776_MSTRCTRL, 0x180, master);
return 0; return 0;
} }
...@@ -243,8 +243,8 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, ...@@ -243,8 +243,8 @@ static int wm8776_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 wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); struct wm8776_priv *wm8776 = snd_soc_component_get_drvdata(component);
int iface_reg, iface; int iface_reg, iface;
int ratio_shift, master; int ratio_shift, master;
int i; int i;
...@@ -279,13 +279,13 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, ...@@ -279,13 +279,13 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream,
iface = 0x30; iface = 0x30;
break; break;
default: default:
dev_err(codec->dev, "Unsupported sample size: %i\n", dev_err(component->dev, "Unsupported sample size: %i\n",
params_width(params)); params_width(params));
return -EINVAL; return -EINVAL;
} }
/* Only need to set MCLK/LRCLK ratio if we're master */ /* Only need to set MCLK/LRCLK ratio if we're master */
if (snd_soc_read(codec, WM8776_MSTRCTRL) & master) { if (snd_soc_component_read32(component, WM8776_MSTRCTRL) & master) {
for (i = 0; i < ARRAY_SIZE(mclk_ratios); i++) { for (i = 0; i < ARRAY_SIZE(mclk_ratios); i++) {
if (wm8776->sysclk[dai->driver->id] / params_rate(params) if (wm8776->sysclk[dai->driver->id] / params_rate(params)
== mclk_ratios[i]) == mclk_ratios[i])
...@@ -293,37 +293,37 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, ...@@ -293,37 +293,37 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream,
} }
if (i == ARRAY_SIZE(mclk_ratios)) { if (i == ARRAY_SIZE(mclk_ratios)) {
dev_err(codec->dev, dev_err(component->dev,
"Unable to configure MCLK ratio %d/%d\n", "Unable to configure MCLK ratio %d/%d\n",
wm8776->sysclk[dai->driver->id], params_rate(params)); wm8776->sysclk[dai->driver->id], params_rate(params));
return -EINVAL; return -EINVAL;
} }
dev_dbg(codec->dev, "MCLK is %dfs\n", mclk_ratios[i]); dev_dbg(component->dev, "MCLK is %dfs\n", mclk_ratios[i]);
snd_soc_update_bits(codec, WM8776_MSTRCTRL, snd_soc_component_update_bits(component, WM8776_MSTRCTRL,
0x7 << ratio_shift, i << ratio_shift); 0x7 << ratio_shift, i << ratio_shift);
} else { } else {
dev_dbg(codec->dev, "DAI in slave mode\n"); dev_dbg(component->dev, "DAI in slave mode\n");
} }
snd_soc_update_bits(codec, iface_reg, 0x30, iface); snd_soc_component_update_bits(component, iface_reg, 0x30, iface);
return 0; return 0;
} }
static int wm8776_mute(struct snd_soc_dai *dai, int mute) static int wm8776_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_write(codec, WM8776_DACMUTE, !!mute); return snd_soc_component_write(component, WM8776_DACMUTE, !!mute);
} }
static int wm8776_set_sysclk(struct snd_soc_dai *dai, static int wm8776_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 = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); struct wm8776_priv *wm8776 = snd_soc_component_get_drvdata(component);
if (WARN_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk))) if (WARN_ON(dai->driver->id >= ARRAY_SIZE(wm8776->sysclk)))
return -EINVAL; return -EINVAL;
...@@ -333,10 +333,10 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai, ...@@ -333,10 +333,10 @@ static int wm8776_set_sysclk(struct snd_soc_dai *dai,
return 0; return 0;
} }
static int wm8776_set_bias_level(struct snd_soc_codec *codec, static int wm8776_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); struct wm8776_priv *wm8776 = snd_soc_component_get_drvdata(component);
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
...@@ -344,16 +344,16 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, ...@@ -344,16 +344,16 @@ static int wm8776_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) {
regcache_sync(wm8776->regmap); regcache_sync(wm8776->regmap);
/* Disable the global powerdown; DAPM does the rest */ /* Disable the global powerdown; DAPM does the rest */
snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); snd_soc_component_update_bits(component, WM8776_PWRDOWN, 1, 0);
} }
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 1); snd_soc_component_update_bits(component, WM8776_PWRDOWN, 1, 1);
break; break;
} }
...@@ -407,37 +407,38 @@ static struct snd_soc_dai_driver wm8776_dai[] = { ...@@ -407,37 +407,38 @@ static struct snd_soc_dai_driver wm8776_dai[] = {
}, },
}; };
static int wm8776_probe(struct snd_soc_codec *codec) static int wm8776_probe(struct snd_soc_component *component)
{ {
int ret = 0; int ret = 0;
ret = wm8776_reset(codec); ret = wm8776_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);
return ret; return ret;
} }
/* Latch the update bits; right channel only since we always /* Latch the update bits; right channel only since we always
* update both. */ * update both. */
snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100); snd_soc_component_update_bits(component, WM8776_HPRVOL, 0x100, 0x100);
snd_soc_update_bits(codec, WM8776_DACRVOL, 0x100, 0x100); snd_soc_component_update_bits(component, WM8776_DACRVOL, 0x100, 0x100);
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8776 = { static const struct snd_soc_component_driver soc_component_dev_wm8776 = {
.probe = wm8776_probe, .probe = wm8776_probe,
.set_bias_level = wm8776_set_bias_level, .set_bias_level = wm8776_set_bias_level,
.suspend_bias_off = true, .controls = wm8776_snd_controls,
.num_controls = ARRAY_SIZE(wm8776_snd_controls),
.component_driver = { .dapm_widgets = wm8776_dapm_widgets,
.controls = wm8776_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8776_snd_controls), .dapm_routes = routes,
.dapm_widgets = wm8776_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(routes),
.num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = routes, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(routes), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct of_device_id wm8776_of_match[] = { static const struct of_device_id wm8776_of_match[] = {
...@@ -475,25 +476,18 @@ static int wm8776_spi_probe(struct spi_device *spi) ...@@ -475,25 +476,18 @@ static int wm8776_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, wm8776); spi_set_drvdata(spi, wm8776);
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai)); &soc_component_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
return ret; return ret;
} }
static int wm8776_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
}
static struct spi_driver wm8776_spi_driver = { static struct spi_driver wm8776_spi_driver = {
.driver = { .driver = {
.name = "wm8776", .name = "wm8776",
.of_match_table = wm8776_of_match, .of_match_table = wm8776_of_match,
}, },
.probe = wm8776_spi_probe, .probe = wm8776_spi_probe,
.remove = wm8776_spi_remove,
}; };
#endif /* CONFIG_SPI_MASTER */ #endif /* CONFIG_SPI_MASTER */
...@@ -515,18 +509,12 @@ static int wm8776_i2c_probe(struct i2c_client *i2c, ...@@ -515,18 +509,12 @@ static int wm8776_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8776); i2c_set_clientdata(i2c, wm8776);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai)); &soc_component_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
return ret; return ret;
} }
static int wm8776_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id wm8776_i2c_id[] = { static const struct i2c_device_id wm8776_i2c_id[] = {
{ "wm8775", WM8775 }, { "wm8775", WM8775 },
{ "wm8776", WM8776 }, { "wm8776", WM8776 },
...@@ -540,7 +528,6 @@ static struct i2c_driver wm8776_i2c_driver = { ...@@ -540,7 +528,6 @@ static struct i2c_driver wm8776_i2c_driver = {
.of_match_table = wm8776_of_match, .of_match_table = wm8776_of_match,
}, },
.probe = wm8776_i2c_probe, .probe = wm8776_i2c_probe,
.remove = wm8776_i2c_remove,
.id_table = wm8776_i2c_id, .id_table = wm8776_i2c_id,
}; };
#endif #endif
......
sound/soc/codecs/wm8782.c
View file @ deb66f3f
...@@ -50,25 +50,21 @@ static struct snd_soc_dai_driver wm8782_dai = { ...@@ -50,25 +50,21 @@ static struct snd_soc_dai_driver wm8782_dai = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_wm8782 = { static const struct snd_soc_component_driver soc_component_dev_wm8782 = {
.component_driver = { .dapm_widgets = wm8782_dapm_widgets,
.dapm_widgets = wm8782_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8782_dapm_widgets),
.num_dapm_widgets = ARRAY_SIZE(wm8782_dapm_widgets), .dapm_routes = wm8782_dapm_routes,
.dapm_routes = wm8782_dapm_routes, .num_dapm_routes = ARRAY_SIZE(wm8782_dapm_routes),
.num_dapm_routes = ARRAY_SIZE(wm8782_dapm_routes), .idle_bias_on = 1,
}, .use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int wm8782_probe(struct platform_device *pdev) static int wm8782_probe(struct platform_device *pdev)
{ {
return snd_soc_register_codec(&pdev->dev, return devm_snd_soc_register_component(&pdev->dev,
&soc_codec_dev_wm8782, &wm8782_dai, 1); &soc_component_dev_wm8782, &wm8782_dai, 1);
}
static int wm8782_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
} }
static struct platform_driver wm8782_codec_driver = { static struct platform_driver wm8782_codec_driver = {
...@@ -76,7 +72,6 @@ static struct platform_driver wm8782_codec_driver = { ...@@ -76,7 +72,6 @@ static struct platform_driver wm8782_codec_driver = {
.name = "wm8782", .name = "wm8782",
}, },
.probe = wm8782_probe, .probe = wm8782_probe,
.remove = wm8782_remove,
}; };
module_platform_driver(wm8782_codec_driver); module_platform_driver(wm8782_codec_driver);
......
sound/soc/codecs/wm8804.c
View file @ deb66f3f
...@@ -137,21 +137,21 @@ static const struct snd_soc_dapm_route wm8804_dapm_routes[] = { ...@@ -137,21 +137,21 @@ static const struct snd_soc_dapm_route wm8804_dapm_routes[] = {
static int wm8804_aif_event(struct snd_soc_dapm_widget *w, static int wm8804_aif_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct wm8804_priv *wm8804 = snd_soc_codec_get_drvdata(codec); struct wm8804_priv *wm8804 = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
/* power up the aif */ /* power up the aif */
if (!wm8804->aif_pwr) if (!wm8804->aif_pwr)
snd_soc_update_bits(codec, WM8804_PWRDN, 0x10, 0x0); snd_soc_component_update_bits(component, WM8804_PWRDN, 0x10, 0x0);
wm8804->aif_pwr++; wm8804->aif_pwr++;
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
/* power down only both paths are disabled */ /* power down only both paths are disabled */
wm8804->aif_pwr--; wm8804->aif_pwr--;
if (!wm8804->aif_pwr) if (!wm8804->aif_pwr)
snd_soc_update_bits(codec, WM8804_PWRDN, 0x10, 0x10); snd_soc_component_update_bits(component, WM8804_PWRDN, 0x10, 0x10);
break; break;
} }
...@@ -161,8 +161,8 @@ static int wm8804_aif_event(struct snd_soc_dapm_widget *w, ...@@ -161,8 +161,8 @@ static int wm8804_aif_event(struct snd_soc_dapm_widget *w,
static int txsrc_put(struct snd_kcontrol *kcontrol, static int txsrc_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
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 soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
unsigned int val = ucontrol->value.enumerated.item[0] << e->shift_l; unsigned int val = ucontrol->value.enumerated.item[0] << e->shift_l;
unsigned int mask = 1 << e->shift_l; unsigned int mask = 1 << e->shift_l;
...@@ -173,18 +173,18 @@ static int txsrc_put(struct snd_kcontrol *kcontrol, ...@@ -173,18 +173,18 @@ static int txsrc_put(struct snd_kcontrol *kcontrol,
snd_soc_dapm_mutex_lock(dapm); snd_soc_dapm_mutex_lock(dapm);
if (snd_soc_test_bits(codec, e->reg, mask, val)) { if (snd_soc_component_test_bits(component, e->reg, mask, val)) {
/* save the current power state of the transmitter */ /* save the current power state of the transmitter */
txpwr = snd_soc_read(codec, WM8804_PWRDN) & 0x4; txpwr = snd_soc_component_read32(component, WM8804_PWRDN) & 0x4;
/* power down the transmitter */ /* power down the transmitter */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, 0x4); snd_soc_component_update_bits(component, WM8804_PWRDN, 0x4, 0x4);
/* set the tx source */ /* set the tx source */
snd_soc_update_bits(codec, e->reg, mask, val); snd_soc_component_update_bits(component, e->reg, mask, val);
/* restore the transmitter's configuration */ /* restore the transmitter's configuration */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, txpwr); snd_soc_component_update_bits(component, WM8804_PWRDN, 0x4, txpwr);
} }
snd_soc_dapm_mutex_unlock(dapm); snd_soc_dapm_mutex_unlock(dapm);
...@@ -218,10 +218,10 @@ static int wm8804_soft_reset(struct wm8804_priv *wm8804) ...@@ -218,10 +218,10 @@ static int wm8804_soft_reset(struct wm8804_priv *wm8804)
static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int wm8804_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:
...@@ -243,8 +243,8 @@ static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -243,8 +243,8 @@ static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
/* set data format */ /* set data format */
snd_soc_update_bits(codec, WM8804_AIFTX, 0x3, format); snd_soc_component_update_bits(component, WM8804_AIFTX, 0x3, format);
snd_soc_update_bits(codec, WM8804_AIFRX, 0x3, format); snd_soc_component_update_bits(component, WM8804_AIFRX, 0x3, format);
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBM_CFM:
...@@ -259,7 +259,7 @@ static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -259,7 +259,7 @@ static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
/* set master/slave mode */ /* set master/slave mode */
snd_soc_update_bits(codec, WM8804_AIFRX, 0x40, master << 6); snd_soc_component_update_bits(component, WM8804_AIFRX, 0x40, master << 6);
bcp = lrp = 0; bcp = lrp = 0;
switch (fmt & SND_SOC_DAIFMT_INV_MASK) { switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
...@@ -280,9 +280,9 @@ static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -280,9 +280,9 @@ static int wm8804_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
/* set frame inversion */ /* set frame inversion */
snd_soc_update_bits(codec, WM8804_AIFTX, 0x10 | 0x20, snd_soc_component_update_bits(component, WM8804_AIFTX, 0x10 | 0x20,
(bcp << 4) | (lrp << 5)); (bcp << 4) | (lrp << 5));
snd_soc_update_bits(codec, WM8804_AIFRX, 0x10 | 0x20, snd_soc_component_update_bits(component, WM8804_AIFRX, 0x10 | 0x20,
(bcp << 4) | (lrp << 5)); (bcp << 4) | (lrp << 5));
return 0; return 0;
} }
...@@ -291,10 +291,10 @@ static int wm8804_hw_params(struct snd_pcm_substream *substream, ...@@ -291,10 +291,10 @@ static int wm8804_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; struct snd_soc_component *component;
u16 blen; u16 blen;
codec = dai->codec; component = dai->component;
switch (params_width(params)) { switch (params_width(params)) {
case 16: case 16:
...@@ -313,8 +313,8 @@ static int wm8804_hw_params(struct snd_pcm_substream *substream, ...@@ -313,8 +313,8 @@ static int wm8804_hw_params(struct snd_pcm_substream *substream,
} }
/* set word length */ /* set word length */
snd_soc_update_bits(codec, WM8804_AIFTX, 0xc, blen << 2); snd_soc_component_update_bits(component, WM8804_AIFTX, 0xc, blen << 2);
snd_soc_update_bits(codec, WM8804_AIFRX, 0xc, blen << 2); snd_soc_component_update_bits(component, WM8804_AIFRX, 0xc, blen << 2);
return 0; return 0;
} }
...@@ -405,8 +405,8 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -405,8 +405,8 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
int source, unsigned int freq_in, int source, unsigned int freq_in,
unsigned int freq_out) unsigned int freq_out)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8804_priv *wm8804 = snd_soc_codec_get_drvdata(codec); struct wm8804_priv *wm8804 = snd_soc_component_get_drvdata(component);
bool change; bool change;
if (!freq_in || !freq_out) { if (!freq_in || !freq_out) {
...@@ -431,18 +431,18 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -431,18 +431,18 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
pm_runtime_get_sync(wm8804->dev); pm_runtime_get_sync(wm8804->dev);
/* set PLLN and PRESCALE */ /* set PLLN and PRESCALE */
snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, snd_soc_component_update_bits(component, WM8804_PLL4, 0xf | 0x10,
pll_div.n | (pll_div.prescale << 4)); pll_div.n | (pll_div.prescale << 4));
/* set mclkdiv and freqmode */ /* set mclkdiv and freqmode */
snd_soc_update_bits(codec, WM8804_PLL5, 0x3 | 0x8, snd_soc_component_update_bits(component, WM8804_PLL5, 0x3 | 0x8,
pll_div.freqmode | (pll_div.mclkdiv << 3)); pll_div.freqmode | (pll_div.mclkdiv << 3));
/* set PLLK */ /* set PLLK */
snd_soc_write(codec, WM8804_PLL1, pll_div.k & 0xff); snd_soc_component_write(component, WM8804_PLL1, pll_div.k & 0xff);
snd_soc_write(codec, WM8804_PLL2, (pll_div.k >> 8) & 0xff); snd_soc_component_write(component, WM8804_PLL2, (pll_div.k >> 8) & 0xff);
snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); snd_soc_component_write(component, WM8804_PLL3, pll_div.k >> 16);
/* power up the PLL */ /* power up the PLL */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); snd_soc_component_update_bits(component, WM8804_PWRDN, 0x1, 0);
} }
return 0; return 0;
...@@ -451,15 +451,15 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -451,15 +451,15 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
static int wm8804_set_sysclk(struct snd_soc_dai *dai, static int wm8804_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;
codec = dai->codec; component = dai->component;
switch (clk_id) { switch (clk_id) {
case WM8804_TX_CLKSRC_MCLK: case WM8804_TX_CLKSRC_MCLK:
if ((freq >= 10000000 && freq <= 14400000) if ((freq >= 10000000 && freq <= 14400000)
|| (freq >= 16280000 && freq <= 27000000)) || (freq >= 16280000 && freq <= 27000000))
snd_soc_update_bits(codec, WM8804_PLL6, 0x80, 0x80); snd_soc_component_update_bits(component, WM8804_PLL6, 0x80, 0x80);
else { else {
dev_err(dai->dev, "OSCCLOCK is not within the " dev_err(dai->dev, "OSCCLOCK is not within the "
"recommended range: %uHz\n", freq); "recommended range: %uHz\n", freq);
...@@ -467,13 +467,13 @@ static int wm8804_set_sysclk(struct snd_soc_dai *dai, ...@@ -467,13 +467,13 @@ static int wm8804_set_sysclk(struct snd_soc_dai *dai,
} }
break; break;
case WM8804_TX_CLKSRC_PLL: case WM8804_TX_CLKSRC_PLL:
snd_soc_update_bits(codec, WM8804_PLL6, 0x80, 0); snd_soc_component_update_bits(component, WM8804_PLL6, 0x80, 0);
break; break;
case WM8804_CLKOUT_SRC_CLK1: case WM8804_CLKOUT_SRC_CLK1:
snd_soc_update_bits(codec, WM8804_PLL6, 0x8, 0); snd_soc_component_update_bits(component, WM8804_PLL6, 0x8, 0);
break; break;
case WM8804_CLKOUT_SRC_OSCCLK: case WM8804_CLKOUT_SRC_OSCCLK:
snd_soc_update_bits(codec, WM8804_PLL6, 0x8, 0x8); snd_soc_component_update_bits(component, WM8804_PLL6, 0x8, 0x8);
break; break;
default: default:
dev_err(dai->dev, "Unknown clock source: %d\n", clk_id); dev_err(dai->dev, "Unknown clock source: %d\n", clk_id);
...@@ -486,17 +486,17 @@ static int wm8804_set_sysclk(struct snd_soc_dai *dai, ...@@ -486,17 +486,17 @@ static int wm8804_set_sysclk(struct snd_soc_dai *dai,
static int wm8804_set_clkdiv(struct snd_soc_dai *dai, static int wm8804_set_clkdiv(struct snd_soc_dai *dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct wm8804_priv *wm8804; struct wm8804_priv *wm8804;
codec = dai->codec; component = dai->component;
switch (div_id) { switch (div_id) {
case WM8804_CLKOUT_DIV: case WM8804_CLKOUT_DIV:
snd_soc_update_bits(codec, WM8804_PLL5, 0x30, snd_soc_component_update_bits(component, WM8804_PLL5, 0x30,
(div & 0x3) << 4); (div & 0x3) << 4);
break; break;
case WM8804_MCLK_DIV: case WM8804_MCLK_DIV:
wm8804 = snd_soc_codec_get_drvdata(codec); wm8804 = snd_soc_component_get_drvdata(component);
wm8804->mclk_div = div; wm8804->mclk_div = div;
break; break;
default: default:
...@@ -542,15 +542,14 @@ static struct snd_soc_dai_driver wm8804_dai = { ...@@ -542,15 +542,14 @@ static struct snd_soc_dai_driver wm8804_dai = {
.symmetric_rates = 1 .symmetric_rates = 1
}; };
static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = { static const struct snd_soc_component_driver soc_component_dev_wm8804 = {
.idle_bias_off = true, .dapm_widgets = wm8804_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets),
.component_driver = { .dapm_routes = wm8804_dapm_routes,
.dapm_widgets = wm8804_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes),
.num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets), .use_pmdown_time = 1,
.dapm_routes = wm8804_dapm_routes, .endianness = 1,
.num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes), .non_legacy_dai_naming = 1,
},
}; };
const struct regmap_config wm8804_regmap_config = { const struct regmap_config wm8804_regmap_config = {
...@@ -661,7 +660,7 @@ int wm8804_probe(struct device *dev, struct regmap *regmap) ...@@ -661,7 +660,7 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
} }
} }
ret = snd_soc_register_codec(dev, &soc_codec_dev_wm8804, ret = devm_snd_soc_register_component(dev, &soc_component_dev_wm8804,
&wm8804_dai, 1); &wm8804_dai, 1);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to register CODEC: %d\n", ret); dev_err(dev, "Failed to register CODEC: %d\n", ret);
...@@ -683,7 +682,6 @@ EXPORT_SYMBOL_GPL(wm8804_probe); ...@@ -683,7 +682,6 @@ EXPORT_SYMBOL_GPL(wm8804_probe);
void wm8804_remove(struct device *dev) void wm8804_remove(struct device *dev)
{ {
pm_runtime_disable(dev); pm_runtime_disable(dev);
snd_soc_unregister_codec(dev);
} }
EXPORT_SYMBOL_GPL(wm8804_remove); EXPORT_SYMBOL_GPL(wm8804_remove);
......
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