hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: isabelle: replace codec to component 

Now we can replace Codec to Component. Let's do it.

Note:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 1	->	.idle_bias_on = 0
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-01-29 04:39:30 +00:00 committed by Mark Brown
parent 7928b2cbe5
commit f572634c90
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
sound/soc/codecs/isabelle.c
View File

@ -867,7 +867,7 @@ static const struct snd_soc_dapm_route isabelle_intercon[] = {
static int isabelle_hs_mute(struct snd_soc_dai *dai, int mute) static int isabelle_hs_mute(struct snd_soc_dai *dai, int mute)
{ {
snd_soc_update_bits(dai->codec, ISABELLE_DAC1_SOFTRAMP_REG, snd_soc_component_update_bits(dai->component, ISABELLE_DAC1_SOFTRAMP_REG,
BIT(4), (mute ? BIT(4) : 0)); BIT(4), (mute ? BIT(4) : 0));
return 0; return 0;
@ -875,7 +875,7 @@ static int isabelle_hs_mute(struct snd_soc_dai *dai, int mute)
static int isabelle_hf_mute(struct snd_soc_dai *dai, int mute) static int isabelle_hf_mute(struct snd_soc_dai *dai, int mute)
{ {
snd_soc_update_bits(dai->codec, ISABELLE_DAC2_SOFTRAMP_REG, snd_soc_component_update_bits(dai->component, ISABELLE_DAC2_SOFTRAMP_REG,
BIT(4), (mute ? BIT(4) : 0)); BIT(4), (mute ? BIT(4) : 0));
return 0; return 0;
@ -883,13 +883,13 @@ static int isabelle_hf_mute(struct snd_soc_dai *dai, int mute)
static int isabelle_line_mute(struct snd_soc_dai *dai, int mute) static int isabelle_line_mute(struct snd_soc_dai *dai, int mute)
{ {
snd_soc_update_bits(dai->codec, ISABELLE_DAC3_SOFTRAMP_REG, snd_soc_component_update_bits(dai->component, ISABELLE_DAC3_SOFTRAMP_REG,
BIT(4), (mute ? BIT(4) : 0)); BIT(4), (mute ? BIT(4) : 0));
return 0; return 0;
} }
static int isabelle_set_bias_level(struct snd_soc_codec *codec, static int isabelle_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
switch (level) { switch (level) {
@ -899,12 +899,12 @@ static int isabelle_set_bias_level(struct snd_soc_codec *codec,
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
snd_soc_update_bits(codec, ISABELLE_PWR_EN_REG, snd_soc_component_update_bits(component, ISABELLE_PWR_EN_REG,
ISABELLE_CHIP_EN, BIT(0)); ISABELLE_CHIP_EN, BIT(0));
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_update_bits(codec, ISABELLE_PWR_EN_REG, snd_soc_component_update_bits(component, ISABELLE_PWR_EN_REG,
ISABELLE_CHIP_EN, 0); ISABELLE_CHIP_EN, 0);
break; break;
} }
@ -916,7 +916,7 @@ static int isabelle_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 aif = 0; u16 aif = 0;
unsigned int fs_val = 0; unsigned int fs_val = 0;
@ -952,7 +952,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, ISABELLE_FS_RATE_CFG_REG, snd_soc_component_update_bits(component, ISABELLE_FS_RATE_CFG_REG,
ISABELLE_FS_RATE_MASK, fs_val); ISABELLE_FS_RATE_MASK, fs_val);
/* bit size */ /* bit size */
@ -967,7 +967,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, ISABELLE_INTF_CFG_REG, snd_soc_component_update_bits(component, ISABELLE_INTF_CFG_REG,
ISABELLE_AIF_LENGTH_MASK, aif); ISABELLE_AIF_LENGTH_MASK, aif);
return 0; return 0;
@ -975,7 +975,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream,
static int isabelle_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int isabelle_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
unsigned int aif_val = 0; unsigned int aif_val = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@ -1003,7 +1003,7 @@ static int isabelle_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, ISABELLE_INTF_CFG_REG, snd_soc_component_update_bits(component, ISABELLE_INTF_CFG_REG,
(ISABELLE_AIF_MS | ISABELLE_AIF_FMT_MASK), aif_val); (ISABELLE_AIF_MS | ISABELLE_AIF_FMT_MASK), aif_val);
return 0; return 0;
@ -1087,17 +1087,17 @@ static struct snd_soc_dai_driver isabelle_dai[] = {
}, },
}; };
static const struct snd_soc_codec_driver soc_codec_dev_isabelle = { static const struct snd_soc_component_driver soc_component_dev_isabelle = {
.set_bias_level = isabelle_set_bias_level, .set_bias_level = isabelle_set_bias_level,
.component_driver = { .controls = isabelle_snd_controls,
.controls = isabelle_snd_controls, .num_controls = ARRAY_SIZE(isabelle_snd_controls),
.num_controls = ARRAY_SIZE(isabelle_snd_controls), .dapm_widgets = isabelle_dapm_widgets,
.dapm_widgets = isabelle_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets),
.num_dapm_widgets = ARRAY_SIZE(isabelle_dapm_widgets), .dapm_routes = isabelle_intercon,
.dapm_routes = isabelle_intercon, .num_dapm_routes = ARRAY_SIZE(isabelle_intercon),
.num_dapm_routes = ARRAY_SIZE(isabelle_intercon), .use_pmdown_time = 1,
}, .endianness = 1,
.idle_bias_off = true, .non_legacy_dai_naming = 1,
}; };
static const struct regmap_config isabelle_regmap_config = { static const struct regmap_config isabelle_regmap_config = {
@ -1125,23 +1125,17 @@ static int isabelle_i2c_probe(struct i2c_client *i2c,
} }
i2c_set_clientdata(i2c, isabelle_regmap); i2c_set_clientdata(i2c, isabelle_regmap);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_isabelle, isabelle_dai, &soc_component_dev_isabelle, isabelle_dai,
ARRAY_SIZE(isabelle_dai)); ARRAY_SIZE(isabelle_dai));
if (ret < 0) { if (ret < 0) {
dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); dev_err(&i2c->dev, "Failed to register component: %d\n", ret);
return ret; return ret;
} }
return ret; return ret;
} }
static int isabelle_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id isabelle_i2c_id[] = { static const struct i2c_device_id isabelle_i2c_id[] = {
{ "isabelle", 0 }, { "isabelle", 0 },
{ } { }
@ -1153,7 +1147,6 @@ static struct i2c_driver isabelle_i2c_driver = {
.name = "isabelle", .name = "isabelle",
}, },
.probe = isabelle_i2c_probe, .probe = isabelle_i2c_probe,
.remove = isabelle_i2c_remove,
.id_table = isabelle_i2c_id, .id_table = isabelle_i2c_id,
}; };