Skip to content

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

Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086',... 

Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086', 'asoc/topic/tas571x', 'asoc/topic/tas5720' and 'asoc/topic/tas6424' into asoc-next
parents e8c768da 79a4ad1e 459bc024 2be04bab a06919f5 fbf3c936
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 279 additions and 298 deletions
sound/soc/codecs/tas2552.c
View file @ 02a8fe81
This diff is collapsed.
sound/soc/codecs/tas5086.c
View file @ 02a8fe81
...@@ -261,9 +261,9 @@ struct tas5086_private { ...@@ -261,9 +261,9 @@ struct tas5086_private {
static int tas5086_deemph[] = { 0, 32000, 44100, 48000 }; static int tas5086_deemph[] = { 0, 32000, 44100, 48000 };
static int tas5086_set_deemph(struct snd_soc_codec *codec) static int tas5086_set_deemph(struct snd_soc_component *component)
{ {
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
int i, val = 0; int i, val = 0;
if (priv->deemph) { if (priv->deemph) {
...@@ -282,8 +282,8 @@ static int tas5086_set_deemph(struct snd_soc_codec *codec) ...@@ -282,8 +282,8 @@ static int tas5086_set_deemph(struct snd_soc_codec *codec)
static int tas5086_get_deemph(struct snd_kcontrol *kcontrol, static int tas5086_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 tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = priv->deemph; ucontrol->value.integer.value[0] = priv->deemph;
...@@ -293,20 +293,20 @@ static int tas5086_get_deemph(struct snd_kcontrol *kcontrol, ...@@ -293,20 +293,20 @@ static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,
static int tas5086_put_deemph(struct snd_kcontrol *kcontrol, static int tas5086_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 tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
priv->deemph = ucontrol->value.integer.value[0]; priv->deemph = ucontrol->value.integer.value[0];
return tas5086_set_deemph(codec); return tas5086_set_deemph(component);
} }
static int tas5086_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int tas5086_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 tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case TAS5086_CLK_IDX_MCLK: case TAS5086_CLK_IDX_MCLK:
...@@ -323,12 +323,12 @@ static int tas5086_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -323,12 +323,12 @@ static int tas5086_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int tas5086_set_dai_fmt(struct snd_soc_dai *codec_dai, static int tas5086_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int format) unsigned int format)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
/* The TAS5086 can only be slave to all clocks */ /* The TAS5086 can only be slave to all clocks */
if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) { if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) {
dev_err(codec->dev, "Invalid clocking mode\n"); dev_err(component->dev, "Invalid clocking mode\n");
return -EINVAL; return -EINVAL;
} }
...@@ -361,8 +361,8 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, ...@@ -361,8 +361,8 @@ static int tas5086_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 tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
int val; int val;
int ret; int ret;
...@@ -373,7 +373,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, ...@@ -373,7 +373,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
ARRAY_SIZE(tas5086_sample_rates), priv->rate); ARRAY_SIZE(tas5086_sample_rates), priv->rate);
if (val < 0) { if (val < 0) {
dev_err(codec->dev, "Invalid sample rate\n"); dev_err(component->dev, "Invalid sample rate\n");
return -EINVAL; return -EINVAL;
} }
...@@ -387,7 +387,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, ...@@ -387,7 +387,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
val = index_in_array(tas5086_ratios, ARRAY_SIZE(tas5086_ratios), val = index_in_array(tas5086_ratios, ARRAY_SIZE(tas5086_ratios),
priv->mclk / priv->rate); priv->mclk / priv->rate);
if (val < 0) { if (val < 0) {
dev_err(codec->dev, "Invalid MCLK / Fs ratio\n"); dev_err(component->dev, "Invalid MCLK / Fs ratio\n");
return -EINVAL; return -EINVAL;
} }
...@@ -424,7 +424,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, ...@@ -424,7 +424,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
val = 0x06; val = 0x06;
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI format\n"); dev_err(component->dev, "Invalid DAI format\n");
return -EINVAL; return -EINVAL;
} }
...@@ -440,7 +440,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, ...@@ -440,7 +440,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
val += 2; val += 2;
break; break;
default: default:
dev_err(codec->dev, "Invalid bit width\n"); dev_err(component->dev, "Invalid bit width\n");
return -EINVAL; return -EINVAL;
} }
...@@ -454,13 +454,13 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream, ...@@ -454,13 +454,13 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
if (ret < 0) if (ret < 0)
return ret; return ret;
return tas5086_set_deemph(codec); return tas5086_set_deemph(component);
} }
static int tas5086_mute_stream(struct snd_soc_dai *dai, int mute, int stream) static int tas5086_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
unsigned int val = 0; unsigned int val = 0;
if (mute) if (mute)
...@@ -773,9 +773,9 @@ static struct snd_soc_dai_driver tas5086_dai = { ...@@ -773,9 +773,9 @@ static struct snd_soc_dai_driver tas5086_dai = {
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int tas5086_soc_suspend(struct snd_soc_codec *codec) static int tas5086_soc_suspend(struct snd_soc_component *component)
{ {
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
int ret; int ret;
/* Shut down all channels */ /* Shut down all channels */
...@@ -788,9 +788,9 @@ static int tas5086_soc_suspend(struct snd_soc_codec *codec) ...@@ -788,9 +788,9 @@ static int tas5086_soc_suspend(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int tas5086_soc_resume(struct snd_soc_codec *codec) static int tas5086_soc_resume(struct snd_soc_component *component)
{ {
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
int ret; int ret;
ret = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies); ret = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies);
...@@ -800,7 +800,7 @@ static int tas5086_soc_resume(struct snd_soc_codec *codec) ...@@ -800,7 +800,7 @@ static int tas5086_soc_resume(struct snd_soc_codec *codec)
tas5086_reset(priv); tas5086_reset(priv);
regcache_mark_dirty(priv->regmap); regcache_mark_dirty(priv->regmap);
ret = tas5086_init(codec->dev, priv); ret = tas5086_init(component->dev, priv);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -823,22 +823,22 @@ static const struct of_device_id tas5086_dt_ids[] = { ...@@ -823,22 +823,22 @@ static const struct of_device_id tas5086_dt_ids[] = {
MODULE_DEVICE_TABLE(of, tas5086_dt_ids); MODULE_DEVICE_TABLE(of, tas5086_dt_ids);
#endif #endif
static int tas5086_probe(struct snd_soc_codec *codec) static int tas5086_probe(struct snd_soc_component *component)
{ {
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
int i, ret; int i, ret;
ret = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies); ret = regulator_bulk_enable(ARRAY_SIZE(priv->supplies), priv->supplies);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to enable regulators: %d\n", ret); dev_err(component->dev, "Failed to enable regulators: %d\n", ret);
return ret; return ret;
} }
priv->pwm_start_mid_z = 0; priv->pwm_start_mid_z = 0;
priv->charge_period = 1300000; /* hardware default is 1300 ms */ priv->charge_period = 1300000; /* hardware default is 1300 ms */
if (of_match_device(of_match_ptr(tas5086_dt_ids), codec->dev)) { if (of_match_device(of_match_ptr(tas5086_dt_ids), component->dev)) {
struct device_node *of_node = codec->dev->of_node; struct device_node *of_node = component->dev->of_node;
of_property_read_u32(of_node, "ti,charge-period", of_property_read_u32(of_node, "ti,charge-period",
&priv->charge_period); &priv->charge_period);
...@@ -855,7 +855,7 @@ static int tas5086_probe(struct snd_soc_codec *codec) ...@@ -855,7 +855,7 @@ static int tas5086_probe(struct snd_soc_codec *codec)
} }
tas5086_reset(priv); tas5086_reset(priv);
ret = tas5086_init(codec->dev, priv); ret = tas5086_init(component->dev, priv);
if (ret < 0) if (ret < 0)
goto exit_disable_regulators; goto exit_disable_regulators;
...@@ -872,32 +872,32 @@ static int tas5086_probe(struct snd_soc_codec *codec) ...@@ -872,32 +872,32 @@ static int tas5086_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
static int tas5086_remove(struct snd_soc_codec *codec) static void tas5086_remove(struct snd_soc_component *component)
{ {
struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec); struct tas5086_private *priv = snd_soc_component_get_drvdata(component);
if (gpio_is_valid(priv->gpio_nreset)) if (gpio_is_valid(priv->gpio_nreset))
/* Set codec to the reset state */ /* Set codec to the reset state */
gpio_set_value(priv->gpio_nreset, 0); gpio_set_value(priv->gpio_nreset, 0);
regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies); regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies);
return 0;
}; };
static const struct snd_soc_codec_driver soc_codec_dev_tas5086 = { static const struct snd_soc_component_driver soc_component_dev_tas5086 = {
.probe = tas5086_probe, .probe = tas5086_probe,
.remove = tas5086_remove, .remove = tas5086_remove,
.suspend = tas5086_soc_suspend, .suspend = tas5086_soc_suspend,
.resume = tas5086_soc_resume, .resume = tas5086_soc_resume,
.component_driver = { .controls = tas5086_controls,
.controls = tas5086_controls, .num_controls = ARRAY_SIZE(tas5086_controls),
.num_controls = ARRAY_SIZE(tas5086_controls), .dapm_widgets = tas5086_dapm_widgets,
.dapm_widgets = tas5086_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(tas5086_dapm_widgets),
.num_dapm_widgets = ARRAY_SIZE(tas5086_dapm_widgets), .dapm_routes = tas5086_dapm_routes,
.dapm_routes = tas5086_dapm_routes, .num_dapm_routes = ARRAY_SIZE(tas5086_dapm_routes),
.num_dapm_routes = ARRAY_SIZE(tas5086_dapm_routes), .idle_bias_on = 1,
}, .use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct i2c_device_id tas5086_i2c_id[] = { static const struct i2c_device_id tas5086_i2c_id[] = {
...@@ -985,7 +985,8 @@ static int tas5086_i2c_probe(struct i2c_client *i2c, ...@@ -985,7 +985,8 @@ static int tas5086_i2c_probe(struct i2c_client *i2c,
regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies); regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies);
if (ret == 0) if (ret == 0)
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_tas5086, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_component_dev_tas5086,
&tas5086_dai, 1); &tas5086_dai, 1);
return ret; return ret;
...@@ -993,7 +994,6 @@ static int tas5086_i2c_probe(struct i2c_client *i2c, ...@@ -993,7 +994,6 @@ static int tas5086_i2c_probe(struct i2c_client *i2c,
static int tas5086_i2c_remove(struct i2c_client *i2c) static int tas5086_i2c_remove(struct i2c_client *i2c)
{ {
snd_soc_unregister_codec(&i2c->dev);
return 0; return 0;
} }
......
sound/soc/codecs/tas571x.c
View file @ 02a8fe81
...@@ -51,7 +51,7 @@ struct tas571x_private { ...@@ -51,7 +51,7 @@ struct tas571x_private {
unsigned int format; unsigned int format;
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
struct gpio_desc *pdn_gpio; struct gpio_desc *pdn_gpio;
struct snd_soc_codec_driver codec_driver; struct snd_soc_component_driver component_driver;
}; };
static int tas571x_register_size(struct tas571x_private *priv, unsigned int reg) static int tas571x_register_size(struct tas571x_private *priv, unsigned int reg)
...@@ -242,8 +242,8 @@ static int tas571x_coefficient_info(struct snd_kcontrol *kcontrol, ...@@ -242,8 +242,8 @@ static int tas571x_coefficient_info(struct snd_kcontrol *kcontrol,
static int tas571x_coefficient_get(struct snd_kcontrol *kcontrol, static int tas571x_coefficient_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct i2c_client *i2c = to_i2c_client(codec->dev); struct i2c_client *i2c = to_i2c_client(component->dev);
int numcoef = kcontrol->private_value >> 16; int numcoef = kcontrol->private_value >> 16;
int index = kcontrol->private_value & 0xffff; int index = kcontrol->private_value & 0xffff;
...@@ -254,8 +254,8 @@ static int tas571x_coefficient_get(struct snd_kcontrol *kcontrol, ...@@ -254,8 +254,8 @@ static int tas571x_coefficient_get(struct snd_kcontrol *kcontrol,
static int tas571x_coefficient_put(struct snd_kcontrol *kcontrol, static int tas571x_coefficient_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct i2c_client *i2c = to_i2c_client(codec->dev); struct i2c_client *i2c = to_i2c_client(component->dev);
int numcoef = kcontrol->private_value >> 16; int numcoef = kcontrol->private_value >> 16;
int index = kcontrol->private_value & 0xffff; int index = kcontrol->private_value & 0xffff;
...@@ -265,7 +265,7 @@ static int tas571x_coefficient_put(struct snd_kcontrol *kcontrol, ...@@ -265,7 +265,7 @@ static int tas571x_coefficient_put(struct snd_kcontrol *kcontrol,
static int tas571x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int format) static int tas571x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int format)
{ {
struct tas571x_private *priv = snd_soc_codec_get_drvdata(dai->codec); struct tas571x_private *priv = snd_soc_component_get_drvdata(dai->component);
priv->format = format; priv->format = format;
...@@ -276,7 +276,7 @@ static int tas571x_hw_params(struct snd_pcm_substream *substream, ...@@ -276,7 +276,7 @@ static int tas571x_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 tas571x_private *priv = snd_soc_codec_get_drvdata(dai->codec); struct tas571x_private *priv = snd_soc_component_get_drvdata(dai->component);
u32 val; u32 val;
switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) { switch (priv->format & SND_SOC_DAIFMT_FORMAT_MASK) {
...@@ -304,13 +304,13 @@ static int tas571x_hw_params(struct snd_pcm_substream *substream, ...@@ -304,13 +304,13 @@ static int tas571x_hw_params(struct snd_pcm_substream *substream,
static int tas571x_mute(struct snd_soc_dai *dai, int mute) static int tas571x_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u8 sysctl2; u8 sysctl2;
int ret; int ret;
sysctl2 = mute ? TAS571X_SYS_CTRL_2_SDN_MASK : 0; sysctl2 = mute ? TAS571X_SYS_CTRL_2_SDN_MASK : 0;
ret = snd_soc_update_bits(codec, ret = snd_soc_component_update_bits(component,
TAS571X_SYS_CTRL_2_REG, TAS571X_SYS_CTRL_2_REG,
TAS571X_SYS_CTRL_2_SDN_MASK, TAS571X_SYS_CTRL_2_SDN_MASK,
sysctl2); sysctl2);
...@@ -319,10 +319,10 @@ static int tas571x_mute(struct snd_soc_dai *dai, int mute) ...@@ -319,10 +319,10 @@ static int tas571x_mute(struct snd_soc_dai *dai, int mute)
return ret; return ret;
} }
static int tas571x_set_bias_level(struct snd_soc_codec *codec, static int tas571x_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct tas571x_private *priv = snd_soc_codec_get_drvdata(codec); struct tas571x_private *priv = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
...@@ -331,11 +331,11 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec, ...@@ -331,11 +331,11 @@ static int tas571x_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) {
if (!IS_ERR(priv->mclk)) { if (!IS_ERR(priv->mclk)) {
ret = clk_prepare_enable(priv->mclk); ret = clk_prepare_enable(priv->mclk);
if (ret) { if (ret) {
dev_err(codec->dev, dev_err(component->dev,
"Failed to enable master clock: %d\n", "Failed to enable master clock: %d\n",
ret); ret);
return ret; return ret;
...@@ -643,16 +643,15 @@ static const struct snd_soc_dapm_route tas571x_dapm_routes[] = { ...@@ -643,16 +643,15 @@ static const struct snd_soc_dapm_route tas571x_dapm_routes[] = {
{ "OUT_D", NULL, "DACR" }, { "OUT_D", NULL, "DACR" },
}; };
static const struct snd_soc_codec_driver tas571x_codec = { static const struct snd_soc_component_driver tas571x_component = {
.set_bias_level = tas571x_set_bias_level, .set_bias_level = tas571x_set_bias_level,
.idle_bias_off = true, .dapm_widgets = tas571x_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(tas571x_dapm_widgets),
.component_driver = { .dapm_routes = tas571x_dapm_routes,
.dapm_widgets = tas571x_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(tas571x_dapm_routes),
.num_dapm_widgets = ARRAY_SIZE(tas571x_dapm_widgets), .use_pmdown_time = 1,
.dapm_routes = tas571x_dapm_routes, .endianness = 1,
.num_dapm_routes = ARRAY_SIZE(tas571x_dapm_routes), .non_legacy_dai_naming = 1,
},
}; };
static struct snd_soc_dai_driver tas571x_dai = { static struct snd_soc_dai_driver tas571x_dai = {
...@@ -746,9 +745,9 @@ static int tas571x_i2c_probe(struct i2c_client *client, ...@@ -746,9 +745,9 @@ static int tas571x_i2c_probe(struct i2c_client *client,
usleep_range(50000, 60000); usleep_range(50000, 60000);
memcpy(&priv->codec_driver, &tas571x_codec, sizeof(priv->codec_driver)); memcpy(&priv->component_driver, &tas571x_component, sizeof(priv->component_driver));
priv->codec_driver.component_driver.controls = priv->chip->controls; priv->component_driver.controls = priv->chip->controls;
priv->codec_driver.component_driver.num_controls = priv->chip->num_controls; priv->component_driver.num_controls = priv->chip->num_controls;
if (priv->chip->vol_reg_size == 2) { if (priv->chip->vol_reg_size == 2) {
/* /*
...@@ -761,7 +760,8 @@ static int tas571x_i2c_probe(struct i2c_client *client, ...@@ -761,7 +760,8 @@ static int tas571x_i2c_probe(struct i2c_client *client,
return ret; return ret;
} }
return snd_soc_register_codec(&client->dev, &priv->codec_driver, return devm_snd_soc_register_component(&client->dev,
&priv->component_driver,
&tas571x_dai, 1); &tas571x_dai, 1);
} }
...@@ -769,7 +769,6 @@ static int tas571x_i2c_remove(struct i2c_client *client) ...@@ -769,7 +769,6 @@ static int tas571x_i2c_remove(struct i2c_client *client)
{ {
struct tas571x_private *priv = i2c_get_clientdata(client); struct tas571x_private *priv = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev);
regulator_bulk_disable(priv->chip->num_supply_names, priv->supplies); regulator_bulk_disable(priv->chip->num_supply_names, priv->supplies);
return 0; return 0;
......
sound/soc/codecs/tas5720.c
View file @ 02a8fe81
This diff is collapsed.
sound/soc/codecs/tas6424.c
View file @ 02a8fe81
...@@ -66,10 +66,10 @@ static const struct snd_kcontrol_new tas6424_snd_controls[] = { ...@@ -66,10 +66,10 @@ static const struct snd_kcontrol_new tas6424_snd_controls[] = {
static int tas6424_dac_event(struct snd_soc_dapm_widget *w, static int tas6424_dac_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 tas6424_data *tas6424 = snd_soc_codec_get_drvdata(codec); struct tas6424_data *tas6424 = snd_soc_component_get_drvdata(component);
dev_dbg(codec->dev, "%s() event=0x%0x\n", __func__, event); dev_dbg(component->dev, "%s() event=0x%0x\n", __func__, event);
if (event & SND_SOC_DAPM_POST_PMU) { if (event & SND_SOC_DAPM_POST_PMU) {
/* Observe codec shutdown-to-active time */ /* Observe codec shutdown-to-active time */
...@@ -105,12 +105,12 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream, ...@@ -105,12 +105,12 @@ static int tas6424_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;
unsigned int rate = params_rate(params); unsigned int rate = params_rate(params);
unsigned int width = params_width(params); unsigned int width = params_width(params);
u8 sap_ctrl = 0; u8 sap_ctrl = 0;
dev_dbg(codec->dev, "%s() rate=%u width=%u\n", __func__, rate, width); dev_dbg(component->dev, "%s() rate=%u width=%u\n", __func__, rate, width);
switch (rate) { switch (rate) {
case 44100: case 44100:
...@@ -123,7 +123,7 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream, ...@@ -123,7 +123,7 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream,
sap_ctrl |= TAS6424_SAP_RATE_96000; sap_ctrl |= TAS6424_SAP_RATE_96000;
break; break;
default: default:
dev_err(codec->dev, "unsupported sample rate: %u\n", rate); dev_err(component->dev, "unsupported sample rate: %u\n", rate);
return -EINVAL; return -EINVAL;
} }
...@@ -134,11 +134,11 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream, ...@@ -134,11 +134,11 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream,
case 24: case 24:
break; break;
default: default:
dev_err(codec->dev, "unsupported sample width: %u\n", width); dev_err(component->dev, "unsupported sample width: %u\n", width);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, TAS6424_SAP_CTRL, snd_soc_component_update_bits(component, TAS6424_SAP_CTRL,
TAS6424_SAP_RATE_MASK | TAS6424_SAP_RATE_MASK |
TAS6424_SAP_TDM_SLOT_SZ_16, TAS6424_SAP_TDM_SLOT_SZ_16,
sap_ctrl); sap_ctrl);
...@@ -148,17 +148,17 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream, ...@@ -148,17 +148,17 @@ static int tas6424_hw_params(struct snd_pcm_substream *substream,
static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u8 serial_format = 0; u8 serial_format = 0;
dev_dbg(codec->dev, "%s() fmt=0x%0x\n", __func__, fmt); dev_dbg(component->dev, "%s() fmt=0x%0x\n", __func__, fmt);
/* clock masters */ /* clock masters */
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBS_CFS:
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI master/slave interface\n"); dev_err(component->dev, "Invalid DAI master/slave interface\n");
return -EINVAL; return -EINVAL;
} }
...@@ -167,7 +167,7 @@ static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -167,7 +167,7 @@ static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case SND_SOC_DAIFMT_NB_NF: case SND_SOC_DAIFMT_NB_NF:
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI clock signal polarity\n"); dev_err(component->dev, "Invalid DAI clock signal polarity\n");
return -EINVAL; return -EINVAL;
} }
...@@ -191,11 +191,11 @@ static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -191,11 +191,11 @@ static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
serial_format |= TAS6424_SAP_LEFTJ; serial_format |= TAS6424_SAP_LEFTJ;
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI interface format\n"); dev_err(component->dev, "Invalid DAI interface format\n");
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, TAS6424_SAP_CTRL, snd_soc_component_update_bits(component, TAS6424_SAP_CTRL,
TAS6424_SAP_FMT_MASK, serial_format); TAS6424_SAP_FMT_MASK, serial_format);
return 0; return 0;
...@@ -205,11 +205,11 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -205,11 +205,11 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai,
unsigned int tx_mask, unsigned int rx_mask, unsigned int tx_mask, unsigned int rx_mask,
int slots, int slot_width) int slots, int slot_width)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
unsigned int first_slot, last_slot; unsigned int first_slot, last_slot;
bool sap_tdm_slot_last; bool sap_tdm_slot_last;
dev_dbg(codec->dev, "%s() tx_mask=%d rx_mask=%d\n", __func__, dev_dbg(component->dev, "%s() tx_mask=%d rx_mask=%d\n", __func__,
tx_mask, rx_mask); tx_mask, rx_mask);
if (!tx_mask || !rx_mask) if (!tx_mask || !rx_mask)
...@@ -224,7 +224,7 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -224,7 +224,7 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai,
last_slot = __fls(rx_mask); last_slot = __fls(rx_mask);
if (last_slot - first_slot != 4) { if (last_slot - first_slot != 4) {
dev_err(codec->dev, "tdm mask must cover 4 contiguous slots\n"); dev_err(component->dev, "tdm mask must cover 4 contiguous slots\n");
return -EINVAL; return -EINVAL;
} }
...@@ -236,11 +236,11 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -236,11 +236,11 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai,
sap_tdm_slot_last = true; sap_tdm_slot_last = true;
break; break;
default: default:
dev_err(codec->dev, "tdm mask must start at slot 0 or 4\n"); dev_err(component->dev, "tdm mask must start at slot 0 or 4\n");
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, TAS6424_SAP_CTRL, TAS6424_SAP_TDM_SLOT_LAST, snd_soc_component_update_bits(component, TAS6424_SAP_CTRL, TAS6424_SAP_TDM_SLOT_LAST,
sap_tdm_slot_last ? TAS6424_SAP_TDM_SLOT_LAST : 0); sap_tdm_slot_last ? TAS6424_SAP_TDM_SLOT_LAST : 0);
return 0; return 0;
...@@ -248,27 +248,27 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai, ...@@ -248,27 +248,27 @@ static int tas6424_set_dai_tdm_slot(struct snd_soc_dai *dai,
static int tas6424_mute(struct snd_soc_dai *dai, int mute) static int tas6424_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
unsigned int val; unsigned int val;
dev_dbg(codec->dev, "%s() mute=%d\n", __func__, mute); dev_dbg(component->dev, "%s() mute=%d\n", __func__, mute);
if (mute) if (mute)
val = TAS6424_ALL_STATE_MUTE; val = TAS6424_ALL_STATE_MUTE;
else else
val = TAS6424_ALL_STATE_PLAY; val = TAS6424_ALL_STATE_PLAY;
snd_soc_write(codec, TAS6424_CH_STATE_CTRL, val); snd_soc_component_write(component, TAS6424_CH_STATE_CTRL, val);
return 0; return 0;
} }
static int tas6424_power_off(struct snd_soc_codec *codec) static int tas6424_power_off(struct snd_soc_component *component)
{ {
struct tas6424_data *tas6424 = snd_soc_codec_get_drvdata(codec); struct tas6424_data *tas6424 = snd_soc_component_get_drvdata(component);
int ret; int ret;
snd_soc_write(codec, TAS6424_CH_STATE_CTRL, TAS6424_ALL_STATE_HIZ); snd_soc_component_write(component, TAS6424_CH_STATE_CTRL, TAS6424_ALL_STATE_HIZ);
regcache_cache_only(tas6424->regmap, true); regcache_cache_only(tas6424->regmap, true);
regcache_mark_dirty(tas6424->regmap); regcache_mark_dirty(tas6424->regmap);
...@@ -276,22 +276,22 @@ static int tas6424_power_off(struct snd_soc_codec *codec) ...@@ -276,22 +276,22 @@ static int tas6424_power_off(struct snd_soc_codec *codec)
ret = regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies), ret = regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies),
tas6424->supplies); tas6424->supplies);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "failed to disable supplies: %d\n", ret); dev_err(component->dev, "failed to disable supplies: %d\n", ret);
return ret; return ret;
} }
return 0; return 0;
} }
static int tas6424_power_on(struct snd_soc_codec *codec) static int tas6424_power_on(struct snd_soc_component *component)
{ {
struct tas6424_data *tas6424 = snd_soc_codec_get_drvdata(codec); struct tas6424_data *tas6424 = snd_soc_component_get_drvdata(component);
int ret; int ret;
ret = regulator_bulk_enable(ARRAY_SIZE(tas6424->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(tas6424->supplies),
tas6424->supplies); tas6424->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);
return ret; return ret;
} }
...@@ -299,11 +299,11 @@ static int tas6424_power_on(struct snd_soc_codec *codec) ...@@ -299,11 +299,11 @@ static int tas6424_power_on(struct snd_soc_codec *codec)
ret = regcache_sync(tas6424->regmap); ret = regcache_sync(tas6424->regmap);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "failed to sync regcache: %d\n", ret); dev_err(component->dev, "failed to sync regcache: %d\n", ret);
return ret; return ret;
} }
snd_soc_write(codec, TAS6424_CH_STATE_CTRL, TAS6424_ALL_STATE_MUTE); snd_soc_component_write(component, TAS6424_CH_STATE_CTRL, TAS6424_ALL_STATE_MUTE);
/* any time we come out of HIZ, the output channels automatically run DC /* any time we come out of HIZ, the output channels automatically run DC
* load diagnostics, wait here until this completes * load diagnostics, wait here until this completes
...@@ -313,39 +313,38 @@ static int tas6424_power_on(struct snd_soc_codec *codec) ...@@ -313,39 +313,38 @@ static int tas6424_power_on(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int tas6424_set_bias_level(struct snd_soc_codec *codec, static int tas6424_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
dev_dbg(codec->dev, "%s() level=%d\n", __func__, level); dev_dbg(component->dev, "%s() level=%d\n", __func__, level);
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
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)
tas6424_power_on(codec); tas6424_power_on(component);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
tas6424_power_off(codec); tas6424_power_off(component);
break; break;
} }
return 0; return 0;
} }
static struct snd_soc_codec_driver soc_codec_dev_tas6424 = { static struct snd_soc_component_driver soc_codec_dev_tas6424 = {
.set_bias_level = tas6424_set_bias_level, .set_bias_level = tas6424_set_bias_level,
.idle_bias_off = true, .controls = tas6424_snd_controls,
.num_controls = ARRAY_SIZE(tas6424_snd_controls),
.component_driver = { .dapm_widgets = tas6424_dapm_widgets,
.controls = tas6424_snd_controls, .num_dapm_widgets = ARRAY_SIZE(tas6424_dapm_widgets),
.num_controls = ARRAY_SIZE(tas6424_snd_controls), .dapm_routes = tas6424_audio_map,
.dapm_widgets = tas6424_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(tas6424_audio_map),
.num_dapm_widgets = ARRAY_SIZE(tas6424_dapm_widgets), .use_pmdown_time = 1,
.dapm_routes = tas6424_audio_map, .endianness = 1,
.num_dapm_routes = ARRAY_SIZE(tas6424_audio_map), .non_legacy_dai_naming = 1,
},
}; };
static struct snd_soc_dai_ops tas6424_speaker_dai_ops = { static struct snd_soc_dai_ops tas6424_speaker_dai_ops = {
...@@ -654,7 +653,7 @@ static int tas6424_i2c_probe(struct i2c_client *client, ...@@ -654,7 +653,7 @@ static int tas6424_i2c_probe(struct i2c_client *client,
INIT_DELAYED_WORK(&tas6424->fault_check_work, tas6424_fault_check_work); INIT_DELAYED_WORK(&tas6424->fault_check_work, tas6424_fault_check_work);
ret = snd_soc_register_codec(dev, &soc_codec_dev_tas6424, ret = devm_snd_soc_register_component(dev, &soc_codec_dev_tas6424,
tas6424_dai, ARRAY_SIZE(tas6424_dai)); tas6424_dai, ARRAY_SIZE(tas6424_dai));
if (ret < 0) { if (ret < 0) {
dev_err(dev, "unable to register codec: %d\n", ret); dev_err(dev, "unable to register codec: %d\n", ret);
...@@ -670,8 +669,6 @@ static int tas6424_i2c_remove(struct i2c_client *client) ...@@ -670,8 +669,6 @@ static int tas6424_i2c_remove(struct i2c_client *client)
struct tas6424_data *tas6424 = dev_get_drvdata(dev); struct tas6424_data *tas6424 = dev_get_drvdata(dev);
int ret; int ret;
snd_soc_unregister_codec(dev);
cancel_delayed_work_sync(&tas6424->fault_check_work); cancel_delayed_work_sync(&tas6424->fault_check_work);
ret = regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies), ret = regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies),
......
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