mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: dmic: replace codec to component

Browse source 
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 04:40:29 +00:00 committed by Mark Brown
parent 7928b2cbe5
commit 6d6c3946d8
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 14 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

33
sound/soc/codecs/dmic.c
View file

@ -71,16 +71,16 @@ static struct snd_soc_dai_driver dmic_dai = {
.ops = &dmic_dai_ops, .ops = &dmic_dai_ops,
}; };
static int dmic_codec_probe(struct snd_soc_codec *codec) static int dmic_component_probe(struct snd_soc_component *component)
{ {
struct gpio_desc *dmic_en; struct gpio_desc *dmic_en;
dmic_en = devm_gpiod_get_optional(codec->dev, dmic_en = devm_gpiod_get_optional(component->dev,
"dmicen", GPIOD_OUT_LOW); "dmicen", GPIOD_OUT_LOW);
if (IS_ERR(dmic_en)) if (IS_ERR(dmic_en))
return PTR_ERR(dmic_en); return PTR_ERR(dmic_en);
snd_soc_codec_set_drvdata(codec, dmic_en); snd_soc_component_set_drvdata(component, dmic_en);
return 0; return 0;
} }
@ -95,14 +95,16 @@ static const struct snd_soc_dapm_route intercon[] = {
{"DMIC AIF", NULL, "DMic"}, {"DMIC AIF", NULL, "DMic"},
}; };
static const struct snd_soc_codec_driver soc_dmic = { static const struct snd_soc_component_driver soc_dmic = {
.probe = dmic_codec_probe, .probe = dmic_component_probe,
.component_driver = { .dapm_widgets = dmic_dapm_widgets,
.dapm_widgets = dmic_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets),
.num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), .dapm_routes = intercon,
.dapm_routes = intercon, .num_dapm_routes = ARRAY_SIZE(intercon),
.num_dapm_routes = ARRAY_SIZE(intercon), .idle_bias_on = 1,
}, .use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int dmic_dev_probe(struct platform_device *pdev) static int dmic_dev_probe(struct platform_device *pdev)
@ -129,16 +131,10 @@ static int dmic_dev_probe(struct platform_device *pdev)
} }
} }
return snd_soc_register_codec(&pdev->dev, return devm_snd_soc_register_component(&pdev->dev,
&soc_dmic, dai_drv, 1); &soc_dmic, dai_drv, 1);
} }
static int dmic_dev_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
}
MODULE_ALIAS("platform:dmic-codec"); MODULE_ALIAS("platform:dmic-codec");
static const struct of_device_id dmic_dev_match[] = { static const struct of_device_id dmic_dev_match[] = {
@ -152,7 +148,6 @@ static struct platform_driver dmic_driver = {
.of_match_table = dmic_dev_match, .of_match_table = dmic_dev_match,
}, },
.probe = dmic_dev_probe, .probe = dmic_dev_probe,
.remove = dmic_dev_remove,
}; };
module_platform_driver(dmic_driver); module_platform_driver(dmic_driver);