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

Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

This commit is contained in:
Mark Brown 2014-01-02 13:01:49 +00:00
parent 802eee95bd 14c3aa9839
commit 30010a2796
2 changed files with 20 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/fsl/Kconfig
View File

@ -197,7 +197,6 @@ config SND_SOC_IMX_SPDIF
tristate "SoC Audio support for i.MX boards with S/PDIF" tristate "SoC Audio support for i.MX boards with S/PDIF"
select SND_SOC_IMX_PCM_DMA select SND_SOC_IMX_PCM_DMA
select SND_SOC_FSL_SPDIF select SND_SOC_FSL_SPDIF
select SND_SOC_SPDIF
select REGMAP_MMIO select REGMAP_MMIO
help help
SoC Audio support for i.MX boards with S/PDIF SoC Audio support for i.MX boards with S/PDIF

82
sound/soc/fsl/imx-spdif.c
View File

@ -14,17 +14,15 @@
#include <sound/soc.h> #include <sound/soc.h>
struct imx_spdif_data { struct imx_spdif_data {
struct snd_soc_dai_link dai[2]; struct snd_soc_dai_link dai;
struct snd_soc_card card; struct snd_soc_card card;
struct platform_device *txdev;
struct platform_device *rxdev;
}; };
static int imx_spdif_audio_probe(struct platform_device *pdev) static int imx_spdif_audio_probe(struct platform_device *pdev)
{ {
struct device_node *spdif_np, *np = pdev->dev.of_node; struct device_node *spdif_np, *np = pdev->dev.of_node;
struct imx_spdif_data *data; struct imx_spdif_data *data;
int ret = 0, num_links = 0; int ret = 0;
spdif_np = of_parse_phandle(np, "spdif-controller", 0); spdif_np = of_parse_phandle(np, "spdif-controller", 0);
if (!spdif_np) { if (!spdif_np) {
@ -40,69 +38,42 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
goto end; goto end;
} }
if (of_property_read_bool(np, "spdif-out")) { data->dai.name = "S/PDIF PCM";
data->dai[num_links].name = "S/PDIF TX"; data->dai.stream_name = "S/PDIF PCM";
data->dai[num_links].stream_name = "S/PDIF PCM Playback"; data->dai.codec_dai_name = "snd-soc-dummy-dai";
data->dai[num_links].codec_dai_name = "dit-hifi"; data->dai.codec_name = "snd-soc-dummy";
data->dai[num_links].codec_name = "spdif-dit"; data->dai.cpu_of_node = spdif_np;
data->dai[num_links].cpu_of_node = spdif_np; data->dai.platform_of_node = spdif_np;
data->dai[num_links].platform_of_node = spdif_np; data->dai.playback_only = true;
num_links++; data->dai.capture_only = true;
data->txdev = platform_device_register_simple("spdif-dit", -1, NULL, 0); if (of_property_read_bool(np, "spdif-out"))
if (IS_ERR(data->txdev)) { data->dai.capture_only = false;
ret = PTR_ERR(data->txdev);
dev_err(&pdev->dev, "register dit failed: %d\n", ret);
goto end;
}
}
if (of_property_read_bool(np, "spdif-in")) { if (of_property_read_bool(np, "spdif-in"))
data->dai[num_links].name = "S/PDIF RX"; data->dai.playback_only = false;
data->dai[num_links].stream_name = "S/PDIF PCM Capture";
data->dai[num_links].codec_dai_name = "dir-hifi";
data->dai[num_links].codec_name = "spdif-dir";
data->dai[num_links].cpu_of_node = spdif_np;
data->dai[num_links].platform_of_node = spdif_np;
num_links++;
data->rxdev = platform_device_register_simple("spdif-dir", -1, NULL, 0); if (data->dai.playback_only && data->dai.capture_only) {
if (IS_ERR(data->rxdev)) {
ret = PTR_ERR(data->rxdev);
dev_err(&pdev->dev, "register dir failed: %d\n", ret);
goto error_dit;
}
}
if (!num_links) {
dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n");
goto error_dir; goto end;
} }
data->card.dev = &pdev->dev; data->card.dev = &pdev->dev;
data->card.num_links = num_links; data->card.dai_link = &data->dai;
data->card.dai_link = data->dai; data->card.num_links = 1;
ret = snd_soc_of_parse_card_name(&data->card, "model"); ret = snd_soc_of_parse_card_name(&data->card, "model");
if (ret) if (ret)
goto error_dir; goto end;
ret = devm_snd_soc_register_card(&pdev->dev, &data->card); ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
if (ret) { if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret); dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
goto error_dir; goto end;
} }
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
goto end;
error_dir:
if (data->rxdev)
platform_device_unregister(data->rxdev);
error_dit:
if (data->txdev)
platform_device_unregister(data->txdev);
end: end:
if (spdif_np) if (spdif_np)
of_node_put(spdif_np); of_node_put(spdif_np);
@ -110,18 +81,6 @@ end:
return ret; return ret;
} }
static int imx_spdif_audio_remove(struct platform_device *pdev)
{
struct imx_spdif_data *data = platform_get_drvdata(pdev);
if (data->rxdev)
platform_device_unregister(data->rxdev);
if (data->txdev)
platform_device_unregister(data->txdev);
return 0;
}
static const struct of_device_id imx_spdif_dt_ids[] = { static const struct of_device_id imx_spdif_dt_ids[] = {
{ .compatible = "fsl,imx-audio-spdif", }, { .compatible = "fsl,imx-audio-spdif", },
{ /* sentinel */ } { /* sentinel */ }
@ -135,7 +94,6 @@ static struct platform_driver imx_spdif_driver = {
.of_match_table = imx_spdif_dt_ids, .of_match_table = imx_spdif_dt_ids,
}, },
.probe = imx_spdif_audio_probe, .probe = imx_spdif_audio_probe,
.remove = imx_spdif_audio_remove,
}; };
module_platform_driver(imx_spdif_driver); module_platform_driver(imx_spdif_driver);