UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: pistachio: 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:42:01 +00:00 committed by Mark Brown
parent 7928b2cbe5
commit 8dc906d3ae
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/img/pistachio-internal-dac.c
View File

@ -122,26 +122,26 @@ static struct snd_soc_dai_driver pistachio_internal_dac_dais[] = {
}, },
}; };
static int pistachio_internal_dac_codec_probe(struct snd_soc_codec *codec) static int pistachio_internal_dac_codec_probe(struct snd_soc_component *component)
{ {
struct pistachio_internal_dac *dac = snd_soc_codec_get_drvdata(codec); struct pistachio_internal_dac *dac = snd_soc_component_get_drvdata(component);
snd_soc_codec_init_regmap(codec, dac->regmap); snd_soc_component_init_regmap(component, dac->regmap);
return 0; return 0;
} }
static const struct snd_soc_codec_driver pistachio_internal_dac_driver = { static const struct snd_soc_component_driver pistachio_internal_dac_driver = {
.probe = pistachio_internal_dac_codec_probe, .probe = pistachio_internal_dac_codec_probe,
.idle_bias_off = true, .controls = pistachio_internal_dac_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(pistachio_internal_dac_snd_controls),
.controls = pistachio_internal_dac_snd_controls, .dapm_widgets = pistachio_internal_dac_widgets,
.num_controls = ARRAY_SIZE(pistachio_internal_dac_snd_controls), .num_dapm_widgets = ARRAY_SIZE(pistachio_internal_dac_widgets),
.dapm_widgets = pistachio_internal_dac_widgets, .dapm_routes = pistachio_internal_dac_routes,
.num_dapm_widgets = ARRAY_SIZE(pistachio_internal_dac_widgets), .num_dapm_routes = ARRAY_SIZE(pistachio_internal_dac_routes),
.dapm_routes = pistachio_internal_dac_routes, .use_pmdown_time = 1,
.num_dapm_routes = ARRAY_SIZE(pistachio_internal_dac_routes), .endianness = 1,
}, .non_legacy_dai_naming = 1,
}; };
static int pistachio_internal_dac_probe(struct platform_device *pdev) static int pistachio_internal_dac_probe(struct platform_device *pdev)
@ -202,11 +202,12 @@ static int pistachio_internal_dac_probe(struct platform_device *pdev)
pm_runtime_enable(dev); pm_runtime_enable(dev);
pm_runtime_idle(dev); pm_runtime_idle(dev);
ret = snd_soc_register_codec(dev, &pistachio_internal_dac_driver, ret = devm_snd_soc_register_component(dev,
&pistachio_internal_dac_driver,
pistachio_internal_dac_dais, pistachio_internal_dac_dais,
ARRAY_SIZE(pistachio_internal_dac_dais)); ARRAY_SIZE(pistachio_internal_dac_dais));
if (ret) { if (ret) {
dev_err(dev, "failed to register codec: %d\n", ret); dev_err(dev, "failed to register component: %d\n", ret);
goto err_pwr; goto err_pwr;
} }
@ -225,7 +226,6 @@ static int pistachio_internal_dac_remove(struct platform_device *pdev)
{ {
struct pistachio_internal_dac *dac = dev_get_drvdata(&pdev->dev); struct pistachio_internal_dac *dac = dev_get_drvdata(&pdev->dev);
snd_soc_unregister_codec(&pdev->dev);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pistachio_internal_dac_pwr_off(dac); pistachio_internal_dac_pwr_off(dac);
regulator_disable(dac->supply); regulator_disable(dac->supply);