leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/pcm179x' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2018-03-28 10:26:17 +08:00
commit 8f7b85a714
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/pcm179x-i2c.c
View File

@ -39,11 +39,6 @@ static int pcm179x_i2c_probe(struct i2c_client *client,
return pcm179x_common_init(&client->dev, regmap); return pcm179x_common_init(&client->dev, regmap);
} }
static int pcm179x_i2c_remove(struct i2c_client *client)
{
return pcm179x_common_exit(&client->dev);
}
static const struct of_device_id pcm179x_of_match[] = { static const struct of_device_id pcm179x_of_match[] = {
{ .compatible = "ti,pcm1792a", }, { .compatible = "ti,pcm1792a", },
{ } { }
@ -63,7 +58,6 @@ static struct i2c_driver pcm179x_i2c_driver = {
}, },
.id_table = pcm179x_i2c_ids, .id_table = pcm179x_i2c_ids,
.probe = pcm179x_i2c_probe, .probe = pcm179x_i2c_probe,
.remove = pcm179x_i2c_remove,
}; };
module_i2c_driver(pcm179x_i2c_driver); module_i2c_driver(pcm179x_i2c_driver);

6
sound/soc/codecs/pcm179x-spi.c
View File

@ -38,11 +38,6 @@ static int pcm179x_spi_probe(struct spi_device *spi)
return pcm179x_common_init(&spi->dev, regmap); return pcm179x_common_init(&spi->dev, regmap);
} }
static int pcm179x_spi_remove(struct spi_device *spi)
{
return pcm179x_common_exit(&spi->dev);
}
static const struct of_device_id pcm179x_of_match[] = { static const struct of_device_id pcm179x_of_match[] = {
{ .compatible = "ti,pcm1792a", }, { .compatible = "ti,pcm1792a", },
{ } { }
@ -62,7 +57,6 @@ static struct spi_driver pcm179x_spi_driver = {
}, },
.id_table = pcm179x_spi_ids, .id_table = pcm179x_spi_ids,
.probe = pcm179x_spi_probe, .probe = pcm179x_spi_probe,
.remove = pcm179x_spi_remove,
}; };
module_spi_driver(pcm179x_spi_driver); module_spi_driver(pcm179x_spi_driver);

45
sound/soc/codecs/pcm179x.c
View File

@ -77,8 +77,8 @@ struct pcm179x_private {
static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai, static int pcm179x_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 pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); struct pcm179x_private *priv = snd_soc_component_get_drvdata(component);
priv->format = format; priv->format = format;
@ -87,8 +87,8 @@ static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai,
static int pcm179x_digital_mute(struct snd_soc_dai *dai, int mute) static int pcm179x_digital_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); struct pcm179x_private *priv = snd_soc_component_get_drvdata(component);
int ret; int ret;
ret = regmap_update_bits(priv->regmap, PCM179X_SOFT_MUTE, ret = regmap_update_bits(priv->regmap, PCM179X_SOFT_MUTE,
@ -103,8 +103,8 @@ static int pcm179x_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 pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); struct pcm179x_private *priv = snd_soc_component_get_drvdata(component);
int val = 0, ret; int val = 0, ret;
priv->rate = params_rate(params); priv->rate = params_rate(params);
@ -137,7 +137,7 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream,
} }
break; break;
default: default:
dev_err(codec->dev, "Invalid DAI format\n"); dev_err(component->dev, "Invalid DAI format\n");
return -EINVAL; return -EINVAL;
} }
@ -205,15 +205,17 @@ const struct regmap_config pcm179x_regmap_config = {
}; };
EXPORT_SYMBOL_GPL(pcm179x_regmap_config); EXPORT_SYMBOL_GPL(pcm179x_regmap_config);
static const struct snd_soc_codec_driver soc_codec_dev_pcm179x = { static const struct snd_soc_component_driver soc_component_dev_pcm179x = {
.component_driver = { .controls = pcm179x_controls,
.controls = pcm179x_controls, .num_controls = ARRAY_SIZE(pcm179x_controls),
.num_controls = ARRAY_SIZE(pcm179x_controls), .dapm_widgets = pcm179x_dapm_widgets,
.dapm_widgets = pcm179x_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(pcm179x_dapm_widgets),
.num_dapm_widgets = ARRAY_SIZE(pcm179x_dapm_widgets), .dapm_routes = pcm179x_dapm_routes,
.dapm_routes = pcm179x_dapm_routes, .num_dapm_routes = ARRAY_SIZE(pcm179x_dapm_routes),
.num_dapm_routes = ARRAY_SIZE(pcm179x_dapm_routes), .idle_bias_on = 1,
}, .use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
int pcm179x_common_init(struct device *dev, struct regmap *regmap) int pcm179x_common_init(struct device *dev, struct regmap *regmap)
@ -228,18 +230,11 @@ int pcm179x_common_init(struct device *dev, struct regmap *regmap)
pcm179x->regmap = regmap; pcm179x->regmap = regmap;
dev_set_drvdata(dev, pcm179x); dev_set_drvdata(dev, pcm179x);
return snd_soc_register_codec(dev, return devm_snd_soc_register_component(dev,
&soc_codec_dev_pcm179x, &pcm179x_dai, 1); &soc_component_dev_pcm179x, &pcm179x_dai, 1);
} }
EXPORT_SYMBOL_GPL(pcm179x_common_init); EXPORT_SYMBOL_GPL(pcm179x_common_init);
int pcm179x_common_exit(struct device *dev)
{
snd_soc_unregister_codec(dev);
return 0;
}
EXPORT_SYMBOL_GPL(pcm179x_common_exit);
MODULE_DESCRIPTION("ASoC PCM179X driver"); MODULE_DESCRIPTION("ASoC PCM179X driver");
MODULE_AUTHOR("Michael Trimarchi <michael@amarulasolutions.com>"); MODULE_AUTHOR("Michael Trimarchi <michael@amarulasolutions.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

1
sound/soc/codecs/pcm179x.h
View File

@ -23,6 +23,5 @@
extern const struct regmap_config pcm179x_regmap_config; extern const struct regmap_config pcm179x_regmap_config;
int pcm179x_common_init(struct device *dev, struct regmap *regmap); int pcm179x_common_init(struct device *dev, struct regmap *regmap);
int pcm179x_common_exit(struct device *dev);
#endif #endif