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

Commit 6264f668 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: tegra: add device tree support for TrimSlice 



This binding doesn't include the nvidia,model or nvidia,audio-routing
properties the other Tegra audio DT bindings have, because this binding
is targetted at a single machine, rather than for any machine using the
tlv320aic23 codec.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3a96c77e

Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
NVIDIA Tegra audio complex for TrimSlice



Required properties:

- compatible : "nvidia,tegra-audio-trimslice"

- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller

- nvidia,audio-codec : The phandle of the WM8903 audio codec



Example:



sound {

	compatible = "nvidia,tegra-audio-trimslice";

	nvidia,i2s-controller = <&tegra_i2s1>;

	nvidia,audio-codec = <&codec>;

};

sound/soc/tegra/trimslice.c

+34 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/mach-types.h>

#include <asm/mach-types.h>





#include <linux/module.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>
@@ -149,6 +150,32 @@ static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev) 
		goto err;

		goto err;

	}

	}





	if (pdev->dev.of_node) {

		trimslice_tlv320aic23_dai.codec_name = NULL;

		trimslice_tlv320aic23_dai.codec_of_node = of_parse_phandle(

				pdev->dev.of_node, "nvidia,audio-codec", 0);

		if (!trimslice_tlv320aic23_dai.codec_of_node) {

			dev_err(&pdev->dev,

				"Property 'nvidia,audio-codec' missing or invalid\n");

			ret = -EINVAL;

			goto err;

		}



		trimslice_tlv320aic23_dai.cpu_dai_name = NULL;

		trimslice_tlv320aic23_dai.cpu_dai_of_node = of_parse_phandle(

				pdev->dev.of_node, "nvidia,i2s-controller", 0);

		if (!trimslice_tlv320aic23_dai.cpu_dai_of_node) {

			dev_err(&pdev->dev,

				"Property 'nvidia,i2s-controller' missing or invalid\n");

			ret = -EINVAL;

			goto err;

		}



		trimslice_tlv320aic23_dai.platform_name = NULL;

		trimslice_tlv320aic23_dai.platform_of_node =

				trimslice_tlv320aic23_dai.cpu_dai_of_node;

	}



	ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);

	ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev);

	if (ret)

	if (ret)

		goto err;

		goto err;
@@ -184,10 +211,17 @@ static int __devexit tegra_snd_trimslice_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





static const struct of_device_id trimslice_of_match[] __devinitconst = {

	{ .compatible = "nvidia,tegra-audio-trimslice", },

	{},

};

MODULE_DEVICE_TABLE(of, trimslice_of_match);



static struct platform_driver tegra_snd_trimslice_driver = {

static struct platform_driver tegra_snd_trimslice_driver = {

	.driver = {

	.driver = {

		.name = DRV_NAME,

		.name = DRV_NAME,

		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

		.of_match_table = trimslice_of_match,

	},

	},

	.probe = tegra_snd_trimslice_probe,

	.probe = tegra_snd_trimslice_probe,

	.remove = __devexit_p(tegra_snd_trimslice_remove),

	.remove = __devexit_p(tegra_snd_trimslice_remove),