Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30010a27 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 802eee95 14c3aa98

sound/soc/fsl/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ config SND_SOC_IMX_SPDIF 
	tristate "SoC Audio support for i.MX boards with S/PDIF"

	select SND_SOC_IMX_PCM_DMA

	select SND_SOC_FSL_SPDIF

	select SND_SOC_SPDIF

	select REGMAP_MMIO

	help

	  SoC Audio support for i.MX boards with S/PDIF

sound/soc/fsl/imx-spdif.c

+21 −63
Original line number Diff line number Diff line
@@ -14,17 +14,15 @@ 
#include <sound/soc.h>



struct imx_spdif_data {

	struct snd_soc_dai_link dai[2];

	struct snd_soc_dai_link dai;

	struct snd_soc_card card;

	struct platform_device *txdev;

	struct platform_device *rxdev;

};



static int imx_spdif_audio_probe(struct platform_device *pdev)

{

	struct device_node *spdif_np, *np = pdev->dev.of_node;

	struct imx_spdif_data *data;

	int ret = 0, num_links = 0;

	int ret = 0;



	spdif_np = of_parse_phandle(np, "spdif-controller", 0);

	if (!spdif_np) {
@@ -40,69 +38,42 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 
		goto end;

	}



	if (of_property_read_bool(np, "spdif-out")) {

		data->dai[num_links].name = "S/PDIF TX";

		data->dai[num_links].stream_name = "S/PDIF PCM Playback";

		data->dai[num_links].codec_dai_name = "dit-hifi";

		data->dai[num_links].codec_name = "spdif-dit";

		data->dai[num_links].cpu_of_node = spdif_np;

		data->dai[num_links].platform_of_node = spdif_np;

		num_links++;



		data->txdev = platform_device_register_simple("spdif-dit", -1, NULL, 0);

		if (IS_ERR(data->txdev)) {

			ret = PTR_ERR(data->txdev);

			dev_err(&pdev->dev, "register dit failed: %d\n", ret);

			goto end;

		}

	}

	data->dai.name = "S/PDIF PCM";

	data->dai.stream_name = "S/PDIF PCM";

	data->dai.codec_dai_name = "snd-soc-dummy-dai";

	data->dai.codec_name = "snd-soc-dummy";

	data->dai.cpu_of_node = spdif_np;

	data->dai.platform_of_node = spdif_np;

	data->dai.playback_only = true;

	data->dai.capture_only = true;



	if (of_property_read_bool(np, "spdif-in")) {

		data->dai[num_links].name = "S/PDIF RX";

		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 (IS_ERR(data->rxdev)) {

			ret = PTR_ERR(data->rxdev);

			dev_err(&pdev->dev, "register dir failed: %d\n", ret);

			goto error_dit;

		}

	}

	if (of_property_read_bool(np, "spdif-out"))

		data->dai.capture_only = false;



	if (of_property_read_bool(np, "spdif-in"))

		data->dai.playback_only = false;



	if (!num_links) {

	if (data->dai.playback_only && data->dai.capture_only) {

		dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n");

		goto error_dir;

		goto end;

	}



	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");

	if (ret)

		goto error_dir;

		goto end;



	ret = devm_snd_soc_register_card(&pdev->dev, &data->card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);

		goto error_dir;

		goto end;

	}



	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:

	if (spdif_np)

		of_node_put(spdif_np);
@@ -110,18 +81,6 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 
	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[] = {

	{ .compatible = "fsl,imx-audio-spdif", },

	{ /* sentinel */ }
@@ -135,7 +94,6 @@ static struct platform_driver imx_spdif_driver = { 
		.of_match_table = imx_spdif_dt_ids,

	},

	.probe = imx_spdif_audio_probe,

	.remove = imx_spdif_audio_remove,

};



module_platform_driver(imx_spdif_driver);