|
|
@@ -143,7 +143,7 @@ static const char *sta32x_supply_names[] = {
|
|
|
struct sta32x_priv {
|
|
|
struct regmap *regmap;
|
|
|
struct regulator_bulk_data supplies[ARRAY_SIZE(sta32x_supply_names)];
|
|
|
- struct snd_soc_codec *codec;
|
|
|
+ struct snd_soc_component *component;
|
|
|
struct sta32x_platform_data *pdata;
|
|
|
|
|
|
unsigned int mclk;
|
|
|
@@ -270,8 +270,8 @@ static int sta32x_coefficient_info(struct snd_kcontrol *kcontrol,
|
|
|
static int sta32x_coefficient_get(struct snd_kcontrol *kcontrol,
|
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
|
{
|
|
|
- struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
int numcoef = kcontrol->private_value >> 16;
|
|
|
int index = kcontrol->private_value & 0xffff;
|
|
|
unsigned int cfud, val;
|
|
|
@@ -312,8 +312,8 @@ exit_unlock:
|
|
|
static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol,
|
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
|
{
|
|
|
- struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
int numcoef = kcontrol->private_value >> 16;
|
|
|
int index = kcontrol->private_value & 0xffff;
|
|
|
unsigned int cfud;
|
|
|
@@ -347,9 +347,9 @@ static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int sta32x_sync_coef_shadow(struct snd_soc_codec *codec)
|
|
|
+static int sta32x_sync_coef_shadow(struct snd_soc_component *component)
|
|
|
{
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
unsigned int cfud;
|
|
|
int i;
|
|
|
|
|
|
@@ -375,16 +375,16 @@ static int sta32x_sync_coef_shadow(struct snd_soc_codec *codec)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int sta32x_cache_sync(struct snd_soc_codec *codec)
|
|
|
+static int sta32x_cache_sync(struct snd_soc_component *component)
|
|
|
{
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
unsigned int mute;
|
|
|
int rc;
|
|
|
|
|
|
/* mute during register sync */
|
|
|
regmap_read(sta32x->regmap, STA32X_MMUTE, &mute);
|
|
|
regmap_write(sta32x->regmap, STA32X_MMUTE, mute | STA32X_MMUTE_MMUTE);
|
|
|
- sta32x_sync_coef_shadow(codec);
|
|
|
+ sta32x_sync_coef_shadow(component);
|
|
|
rc = regcache_sync(sta32x->regmap);
|
|
|
regmap_write(sta32x->regmap, STA32X_MMUTE, mute);
|
|
|
return rc;
|
|
|
@@ -395,17 +395,17 @@ static void sta32x_watchdog(struct work_struct *work)
|
|
|
{
|
|
|
struct sta32x_priv *sta32x = container_of(work, struct sta32x_priv,
|
|
|
watchdog_work.work);
|
|
|
- struct snd_soc_codec *codec = sta32x->codec;
|
|
|
+ struct snd_soc_component *component = sta32x->component;
|
|
|
unsigned int confa, confa_cached;
|
|
|
|
|
|
/* check if sta32x has reset itself */
|
|
|
- confa_cached = snd_soc_read(codec, STA32X_CONFA);
|
|
|
+ confa_cached = snd_soc_component_read32(component, STA32X_CONFA);
|
|
|
regcache_cache_bypass(sta32x->regmap, true);
|
|
|
- confa = snd_soc_read(codec, STA32X_CONFA);
|
|
|
+ confa = snd_soc_component_read32(component, STA32X_CONFA);
|
|
|
regcache_cache_bypass(sta32x->regmap, false);
|
|
|
if (confa != confa_cached) {
|
|
|
regcache_mark_dirty(sta32x->regmap);
|
|
|
- sta32x_cache_sync(codec);
|
|
|
+ sta32x_cache_sync(component);
|
|
|
}
|
|
|
|
|
|
if (!sta32x->shutdown)
|
|
|
@@ -582,10 +582,10 @@ static int mcs_ratio_table[3][7] = {
|
|
|
static int sta32x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|
|
int clk_id, unsigned int freq, int dir)
|
|
|
{
|
|
|
- struct snd_soc_codec *codec = codec_dai->codec;
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct snd_soc_component *component = codec_dai->component;
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
|
|
|
- dev_dbg(codec->dev, "mclk=%u\n", freq);
|
|
|
+ dev_dbg(component->dev, "mclk=%u\n", freq);
|
|
|
sta32x->mclk = freq;
|
|
|
|
|
|
return 0;
|
|
|
@@ -602,8 +602,8 @@ static int sta32x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|
|
static int sta32x_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|
|
unsigned int fmt)
|
|
|
{
|
|
|
- struct snd_soc_codec *codec = codec_dai->codec;
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct snd_soc_component *component = codec_dai->component;
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
u8 confb = 0;
|
|
|
|
|
|
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
|
|
@@ -651,22 +651,22 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
struct snd_pcm_hw_params *params,
|
|
|
struct snd_soc_dai *dai)
|
|
|
{
|
|
|
- struct snd_soc_codec *codec = dai->codec;
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct snd_soc_component *component = dai->component;
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
int i, mcs = -EINVAL, ir = -EINVAL;
|
|
|
unsigned int confa, confb;
|
|
|
unsigned int rate, ratio;
|
|
|
int ret;
|
|
|
|
|
|
if (!sta32x->mclk) {
|
|
|
- dev_err(codec->dev,
|
|
|
+ dev_err(component->dev,
|
|
|
"sta32x->mclk is unset. Unable to determine ratio\n");
|
|
|
return -EIO;
|
|
|
}
|
|
|
|
|
|
rate = params_rate(params);
|
|
|
ratio = sta32x->mclk / rate;
|
|
|
- dev_dbg(codec->dev, "rate: %u, ratio: %u\n", rate, ratio);
|
|
|
+ dev_dbg(component->dev, "rate: %u, ratio: %u\n", rate, ratio);
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(interpolation_ratios); i++) {
|
|
|
if (interpolation_ratios[i].fs == rate) {
|
|
|
@@ -676,7 +676,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
}
|
|
|
|
|
|
if (ir < 0) {
|
|
|
- dev_err(codec->dev, "Unsupported samplerate: %u\n", rate);
|
|
|
+ dev_err(component->dev, "Unsupported samplerate: %u\n", rate);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
@@ -688,7 +688,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
}
|
|
|
|
|
|
if (mcs < 0) {
|
|
|
- dev_err(codec->dev, "Unresolvable ratio: %u\n", ratio);
|
|
|
+ dev_err(component->dev, "Unresolvable ratio: %u\n", ratio);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
@@ -698,10 +698,10 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
|
|
|
switch (params_width(params)) {
|
|
|
case 24:
|
|
|
- dev_dbg(codec->dev, "24bit\n");
|
|
|
+ dev_dbg(component->dev, "24bit\n");
|
|
|
/* fall through */
|
|
|
case 32:
|
|
|
- dev_dbg(codec->dev, "24bit or 32bit\n");
|
|
|
+ dev_dbg(component->dev, "24bit or 32bit\n");
|
|
|
switch (sta32x->format) {
|
|
|
case SND_SOC_DAIFMT_I2S:
|
|
|
confb |= 0x0;
|
|
|
@@ -716,7 +716,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
|
|
|
break;
|
|
|
case 20:
|
|
|
- dev_dbg(codec->dev, "20bit\n");
|
|
|
+ dev_dbg(component->dev, "20bit\n");
|
|
|
switch (sta32x->format) {
|
|
|
case SND_SOC_DAIFMT_I2S:
|
|
|
confb |= 0x4;
|
|
|
@@ -731,7 +731,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
|
|
|
break;
|
|
|
case 18:
|
|
|
- dev_dbg(codec->dev, "18bit\n");
|
|
|
+ dev_dbg(component->dev, "18bit\n");
|
|
|
switch (sta32x->format) {
|
|
|
case SND_SOC_DAIFMT_I2S:
|
|
|
confb |= 0x8;
|
|
|
@@ -746,7 +746,7 @@ static int sta32x_hw_params(struct snd_pcm_substream *substream,
|
|
|
|
|
|
break;
|
|
|
case 16:
|
|
|
- dev_dbg(codec->dev, "16bit\n");
|
|
|
+ dev_dbg(component->dev, "16bit\n");
|
|
|
switch (sta32x->format) {
|
|
|
case SND_SOC_DAIFMT_I2S:
|
|
|
confb |= 0x0;
|
|
|
@@ -793,20 +793,20 @@ static int sta32x_startup_sequence(struct sta32x_priv *sta32x)
|
|
|
|
|
|
/**
|
|
|
* sta32x_set_bias_level - DAPM callback
|
|
|
- * @codec: the codec device
|
|
|
+ * @component: the component device
|
|
|
* @level: DAPM power level
|
|
|
*
|
|
|
- * This is called by ALSA to put the codec into low power mode
|
|
|
- * or to wake it up. If the codec is powered off completely
|
|
|
+ * This is called by ALSA to put the component into low power mode
|
|
|
+ * or to wake it up. If the component is powered off completely
|
|
|
* all registers must be restored after power on.
|
|
|
*/
|
|
|
-static int sta32x_set_bias_level(struct snd_soc_codec *codec,
|
|
|
+static int sta32x_set_bias_level(struct snd_soc_component *component,
|
|
|
enum snd_soc_bias_level level)
|
|
|
{
|
|
|
int ret;
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
|
|
|
- dev_dbg(codec->dev, "level = %d\n", level);
|
|
|
+ dev_dbg(component->dev, "level = %d\n", level);
|
|
|
switch (level) {
|
|
|
case SND_SOC_BIAS_ON:
|
|
|
break;
|
|
|
@@ -819,17 +819,17 @@ static int sta32x_set_bias_level(struct snd_soc_codec *codec,
|
|
|
break;
|
|
|
|
|
|
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(sta32x->supplies),
|
|
|
sta32x->supplies);
|
|
|
if (ret != 0) {
|
|
|
- dev_err(codec->dev,
|
|
|
+ dev_err(component->dev,
|
|
|
"Failed to enable supplies: %d\n", ret);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
sta32x_startup_sequence(sta32x);
|
|
|
- sta32x_cache_sync(codec);
|
|
|
+ sta32x_cache_sync(component);
|
|
|
sta32x_watchdog_start(sta32x);
|
|
|
}
|
|
|
|
|
|
@@ -874,21 +874,21 @@ static struct snd_soc_dai_driver sta32x_dai = {
|
|
|
.ops = &sta32x_dai_ops,
|
|
|
};
|
|
|
|
|
|
-static int sta32x_probe(struct snd_soc_codec *codec)
|
|
|
+static int sta32x_probe(struct snd_soc_component *component)
|
|
|
{
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
struct sta32x_platform_data *pdata = sta32x->pdata;
|
|
|
int i, ret = 0, thermal = 0;
|
|
|
ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
|
|
|
sta32x->supplies);
|
|
|
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;
|
|
|
}
|
|
|
|
|
|
ret = sta32x_startup_sequence(sta32x);
|
|
|
if (ret < 0) {
|
|
|
- dev_err(codec->dev, "Failed to startup device\n");
|
|
|
+ dev_err(component->dev, "Failed to startup device\n");
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
@@ -968,36 +968,36 @@ static int sta32x_probe(struct snd_soc_codec *codec)
|
|
|
if (sta32x->pdata->needs_esd_watchdog)
|
|
|
INIT_DELAYED_WORK(&sta32x->watchdog_work, sta32x_watchdog);
|
|
|
|
|
|
- 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 */
|
|
|
regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int sta32x_remove(struct snd_soc_codec *codec)
|
|
|
+static void sta32x_remove(struct snd_soc_component *component)
|
|
|
{
|
|
|
- struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
|
|
|
+ struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
|
|
|
|
|
|
sta32x_watchdog_stop(sta32x);
|
|
|
regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
|
|
|
-
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
-static const struct snd_soc_codec_driver sta32x_codec = {
|
|
|
- .probe = sta32x_probe,
|
|
|
- .remove = sta32x_remove,
|
|
|
- .set_bias_level = sta32x_set_bias_level,
|
|
|
- .suspend_bias_off = true,
|
|
|
- .component_driver = {
|
|
|
- .controls = sta32x_snd_controls,
|
|
|
- .num_controls = ARRAY_SIZE(sta32x_snd_controls),
|
|
|
- .dapm_widgets = sta32x_dapm_widgets,
|
|
|
- .num_dapm_widgets = ARRAY_SIZE(sta32x_dapm_widgets),
|
|
|
- .dapm_routes = sta32x_dapm_routes,
|
|
|
- .num_dapm_routes = ARRAY_SIZE(sta32x_dapm_routes),
|
|
|
- },
|
|
|
+static const struct snd_soc_component_driver sta32x_component = {
|
|
|
+ .probe = sta32x_probe,
|
|
|
+ .remove = sta32x_remove,
|
|
|
+ .set_bias_level = sta32x_set_bias_level,
|
|
|
+ .controls = sta32x_snd_controls,
|
|
|
+ .num_controls = ARRAY_SIZE(sta32x_snd_controls),
|
|
|
+ .dapm_widgets = sta32x_dapm_widgets,
|
|
|
+ .num_dapm_widgets = ARRAY_SIZE(sta32x_dapm_widgets),
|
|
|
+ .dapm_routes = sta32x_dapm_routes,
|
|
|
+ .num_dapm_routes = ARRAY_SIZE(sta32x_dapm_routes),
|
|
|
+ .suspend_bias_off = 1,
|
|
|
+ .idle_bias_on = 1,
|
|
|
+ .use_pmdown_time = 1,
|
|
|
+ .endianness = 1,
|
|
|
+ .non_legacy_dai_naming = 1,
|
|
|
};
|
|
|
|
|
|
static const struct regmap_config sta32x_regmap = {
|
|
|
@@ -1121,19 +1121,14 @@ static int sta32x_i2c_probe(struct i2c_client *i2c,
|
|
|
|
|
|
i2c_set_clientdata(i2c, sta32x);
|
|
|
|
|
|
- ret = snd_soc_register_codec(dev, &sta32x_codec, &sta32x_dai, 1);
|
|
|
+ ret = devm_snd_soc_register_component(dev, &sta32x_component,
|
|
|
+ &sta32x_dai, 1);
|
|
|
if (ret < 0)
|
|
|
- dev_err(dev, "Failed to register codec (%d)\n", ret);
|
|
|
+ dev_err(dev, "Failed to register component (%d)\n", ret);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int sta32x_i2c_remove(struct i2c_client *client)
|
|
|
-{
|
|
|
- snd_soc_unregister_codec(&client->dev);
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static const struct i2c_device_id sta32x_i2c_id[] = {
|
|
|
{ "sta326", 0 },
|
|
|
{ "sta328", 0 },
|
|
|
@@ -1148,7 +1143,6 @@ static struct i2c_driver sta32x_i2c_driver = {
|
|
|
.of_match_table = of_match_ptr(st32x_dt_ids),
|
|
|
},
|
|
|
.probe = sta32x_i2c_probe,
|
|
|
- .remove = sta32x_i2c_remove,
|
|
|
.id_table = sta32x_i2c_id,
|
|
|
};
|
|
|
|
Mark Brown
7 years ago