p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: cs4271: 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 = 0	->	.idle_bias_on = 1
	.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 03:50:28 +00:00 committed by Mark Brown
parent 7928b2cbe5
commit cac308fcd7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 52 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/cs4271-i2c.c
View File

@ -33,12 +33,6 @@ static int cs4271_i2c_probe(struct i2c_client *client,
devm_regmap_init_i2c(client, &config)); devm_regmap_init_i2c(client, &config));
} }
static int cs4271_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id cs4271_i2c_id[] = { static const struct i2c_device_id cs4271_i2c_id[] = {
{ "cs4271", 0 }, { "cs4271", 0 },
{ } { }
@ -51,7 +45,6 @@ static struct i2c_driver cs4271_i2c_driver = {
.of_match_table = of_match_ptr(cs4271_dt_ids), .of_match_table = of_match_ptr(cs4271_dt_ids),
}, },
.probe = cs4271_i2c_probe, .probe = cs4271_i2c_probe,
.remove = cs4271_i2c_remove,
.id_table = cs4271_i2c_id, .id_table = cs4271_i2c_id,
}; };
module_i2c_driver(cs4271_i2c_driver); module_i2c_driver(cs4271_i2c_driver);

7
sound/soc/codecs/cs4271-spi.c
View File

@ -33,19 +33,12 @@ static int cs4271_spi_probe(struct spi_device *spi)
return cs4271_probe(&spi->dev, devm_regmap_init_spi(spi, &config)); return cs4271_probe(&spi->dev, devm_regmap_init_spi(spi, &config));
} }
static int cs4271_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
return 0;
}
static struct spi_driver cs4271_spi_driver = { static struct spi_driver cs4271_spi_driver = {
.driver = { .driver = {
.name = "cs4271", .name = "cs4271",
.of_match_table = of_match_ptr(cs4271_dt_ids), .of_match_table = of_match_ptr(cs4271_dt_ids),
}, },
.probe = cs4271_spi_probe, .probe = cs4271_spi_probe,
.remove = cs4271_spi_remove,
}; };
module_spi_driver(cs4271_spi_driver); module_spi_driver(cs4271_spi_driver);

105
sound/soc/codecs/cs4271.c
View File

@ -206,8 +206,8 @@ static const struct snd_soc_dapm_route cs4271_dapm_routes[] = {
static int cs4271_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int cs4271_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 cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
cs4271->mclk = freq; cs4271->mclk = freq;
return 0; return 0;
@ -216,8 +216,8 @@ static int cs4271_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai, static int cs4271_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 cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
unsigned int val = 0; unsigned int val = 0;
int ret; int ret;
@ -230,7 +230,7 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
val |= CS4271_MODE1_MASTER; val |= CS4271_MODE1_MASTER;
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI format\n"); dev_err(component->dev, "Invalid DAI format\n");
return -EINVAL; return -EINVAL;
} }
@ -250,7 +250,7 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
return ret; return ret;
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI format\n"); dev_err(component->dev, "Invalid DAI format\n");
return -EINVAL; return -EINVAL;
} }
@ -263,9 +263,9 @@ static int cs4271_set_dai_fmt(struct snd_soc_dai *codec_dai,
static int cs4271_deemph[] = {0, 44100, 48000, 32000}; static int cs4271_deemph[] = {0, 44100, 48000, 32000};
static int cs4271_set_deemph(struct snd_soc_codec *codec) static int cs4271_set_deemph(struct snd_soc_component *component)
{ {
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
int i, ret; int i, ret;
int val = CS4271_DACCTL_DEM_DIS; int val = CS4271_DACCTL_DEM_DIS;
@ -289,8 +289,8 @@ static int cs4271_set_deemph(struct snd_soc_codec *codec)
static int cs4271_get_deemph(struct snd_kcontrol *kcontrol, static int cs4271_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 cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = cs4271->deemph; ucontrol->value.integer.value[0] = cs4271->deemph;
return 0; return 0;
@ -299,11 +299,11 @@ static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
static int cs4271_put_deemph(struct snd_kcontrol *kcontrol, static int cs4271_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 cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
cs4271->deemph = ucontrol->value.integer.value[0]; cs4271->deemph = ucontrol->value.integer.value[0];
return cs4271_set_deemph(codec); return cs4271_set_deemph(component);
} }
struct cs4271_clk_cfg { struct cs4271_clk_cfg {
@ -349,8 +349,8 @@ static int cs4271_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 cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
int i, ret; int i, ret;
unsigned int ratio, val; unsigned int ratio, val;
@ -399,7 +399,7 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
break; break;
if (i == CS4171_NR_RATIOS) { if (i == CS4171_NR_RATIOS) {
dev_err(codec->dev, "Invalid sample rate\n"); dev_err(component->dev, "Invalid sample rate\n");
return -EINVAL; return -EINVAL;
} }
@ -410,13 +410,13 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
if (ret < 0) if (ret < 0)
return ret; return ret;
return cs4271_set_deemph(codec); return cs4271_set_deemph(component);
} }
static int cs4271_mute_stream(struct snd_soc_dai *dai, int mute, int stream) static int cs4271_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 cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
int ret; int ret;
int val_a = 0; int val_a = 0;
int val_b = 0; int val_b = 0;
@ -493,9 +493,9 @@ static struct snd_soc_dai_driver cs4271_dai = {
.symmetric_rates = 1, .symmetric_rates = 1,
}; };
static int cs4271_reset(struct snd_soc_codec *codec) static int cs4271_reset(struct snd_soc_component *component)
{ {
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
if (gpio_is_valid(cs4271->gpio_nreset)) { if (gpio_is_valid(cs4271->gpio_nreset)) {
gpio_direction_output(cs4271->gpio_nreset, 0); gpio_direction_output(cs4271->gpio_nreset, 0);
@ -508,10 +508,10 @@ static int cs4271_reset(struct snd_soc_codec *codec)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int cs4271_soc_suspend(struct snd_soc_codec *codec) static int cs4271_soc_suspend(struct snd_soc_component *component)
{ {
int ret; int ret;
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
/* Set power-down bit */ /* Set power-down bit */
ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
@ -525,20 +525,20 @@ static int cs4271_soc_suspend(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int cs4271_soc_resume(struct snd_soc_codec *codec) static int cs4271_soc_resume(struct snd_soc_component *component)
{ {
int ret; int ret;
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies),
cs4271->supplies); cs4271->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;
} }
/* Do a proper reset after power up */ /* Do a proper reset after power up */
cs4271_reset(codec); cs4271_reset(component);
/* Restore codec state */ /* Restore codec state */
ret = regcache_sync(cs4271->regmap); ret = regcache_sync(cs4271->regmap);
@ -567,20 +567,20 @@ MODULE_DEVICE_TABLE(of, cs4271_dt_ids);
EXPORT_SYMBOL_GPL(cs4271_dt_ids); EXPORT_SYMBOL_GPL(cs4271_dt_ids);
#endif #endif
static int cs4271_codec_probe(struct snd_soc_codec *codec) static int cs4271_component_probe(struct snd_soc_component *component)
{ {
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; struct cs4271_platform_data *cs4271plat = component->dev->platform_data;
int ret; int ret;
bool amutec_eq_bmutec = false; bool amutec_eq_bmutec = false;
#ifdef CONFIG_OF #ifdef CONFIG_OF
if (of_match_device(cs4271_dt_ids, codec->dev)) { if (of_match_device(cs4271_dt_ids, component->dev)) {
if (of_get_property(codec->dev->of_node, if (of_get_property(component->dev->of_node,
"cirrus,amutec-eq-bmutec", NULL)) "cirrus,amutec-eq-bmutec", NULL))
amutec_eq_bmutec = true; amutec_eq_bmutec = true;
if (of_get_property(codec->dev->of_node, if (of_get_property(component->dev->of_node,
"cirrus,enable-soft-reset", NULL)) "cirrus,enable-soft-reset", NULL))
cs4271->enable_soft_reset = true; cs4271->enable_soft_reset = true;
} }
@ -589,7 +589,7 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec)
ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(cs4271->supplies),
cs4271->supplies); cs4271->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;
} }
@ -599,7 +599,7 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec)
} }
/* Reset codec */ /* Reset codec */
cs4271_reset(codec); cs4271_reset(component);
ret = regcache_sync(cs4271->regmap); ret = regcache_sync(cs4271->regmap);
if (ret < 0) if (ret < 0)
@ -625,9 +625,9 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int cs4271_codec_remove(struct snd_soc_codec *codec) static void cs4271_component_remove(struct snd_soc_component *component)
{ {
struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
if (gpio_is_valid(cs4271->gpio_nreset)) if (gpio_is_valid(cs4271->gpio_nreset))
/* Set codec to the reset state */ /* Set codec to the reset state */
@ -635,24 +635,23 @@ static int cs4271_codec_remove(struct snd_soc_codec *codec)
regcache_mark_dirty(cs4271->regmap); regcache_mark_dirty(cs4271->regmap);
regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies);
return 0;
}; };
static const struct snd_soc_codec_driver soc_codec_dev_cs4271 = { static const struct snd_soc_component_driver soc_component_dev_cs4271 = {
.probe = cs4271_codec_probe, .probe = cs4271_component_probe,
.remove = cs4271_codec_remove, .remove = cs4271_component_remove,
.suspend = cs4271_soc_suspend, .suspend = cs4271_soc_suspend,
.resume = cs4271_soc_resume, .resume = cs4271_soc_resume,
.controls = cs4271_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(cs4271_snd_controls),
.controls = cs4271_snd_controls, .dapm_widgets = cs4271_dapm_widgets,
.num_controls = ARRAY_SIZE(cs4271_snd_controls), .num_dapm_widgets = ARRAY_SIZE(cs4271_dapm_widgets),
.dapm_widgets = cs4271_dapm_widgets, .dapm_routes = cs4271_dapm_routes,
.num_dapm_widgets = ARRAY_SIZE(cs4271_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(cs4271_dapm_routes),
.dapm_routes = cs4271_dapm_routes, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(cs4271_dapm_routes), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int cs4271_common_probe(struct device *dev, static int cs4271_common_probe(struct device *dev,
@ -721,8 +720,8 @@ int cs4271_probe(struct device *dev, struct regmap *regmap)
dev_set_drvdata(dev, cs4271); dev_set_drvdata(dev, cs4271);
cs4271->regmap = regmap; cs4271->regmap = regmap;
return snd_soc_register_codec(dev, &soc_codec_dev_cs4271, &cs4271_dai, return devm_snd_soc_register_component(dev, &soc_component_dev_cs4271,
1); &cs4271_dai, 1);
} }
EXPORT_SYMBOL_GPL(cs4271_probe); EXPORT_SYMBOL_GPL(cs4271_probe);