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

Commit 1427e660 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Remove redundant num-serializer DT parameter 



The serial-dir array gives this information so there is no need to have the
num-serializer property in DT description.
Just ignore the property in the driver the DTS files can be updated
separately without regression.
Update the documentation at the same time for davinci-mcasp

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 62561b39

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ mcasp0: mcasp0@1d00000 { 
	interrupts-names = "tx", "rx";

	op-mode = <0>;		/* MCASP_IIS_MODE */

	tdm-slots = <2>;

	num-serializer = <16>;

	serial-dir = <

			0 0 0 0	/* 0: INACTIVE, 1: TX, 2: RX */

			0 0 0 0

sound/soc/davinci/davinci-mcasp.c

+5 −17
Original line number Diff line number Diff line
@@ -1050,7 +1050,6 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of( 
	struct of_phandle_args dma_spec;



	const u32 *of_serial_dir32;

	u8 *of_serial_dir;

	u32 val;

	int i, ret = 0;
@@ -1081,22 +1080,10 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of( 
		pdata->tdm_slots = val;

	}



	ret = of_property_read_u32(np, "num-serializer", &val);

	if (ret >= 0)

		pdata->num_serializer = val;



	of_serial_dir32 = of_get_property(np, "serial-dir", &val);

	val /= sizeof(u32);

	if (val != pdata->num_serializer) {

		dev_err(&pdev->dev,

				"num-serializer(%d) != serial-dir size(%d)\n",

				pdata->num_serializer, val);

		ret = -EINVAL;

		goto nodata;

	}



	if (of_serial_dir32) {

		of_serial_dir = devm_kzalloc(&pdev->dev,

		u8 *of_serial_dir = devm_kzalloc(&pdev->dev,

						 (sizeof(*of_serial_dir) * val),

						 GFP_KERNEL);

		if (!of_serial_dir) {
@@ -1104,9 +1091,10 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of( 
			goto nodata;

		}



		for (i = 0; i < pdata->num_serializer; i++)

		for (i = 0; i < val; i++)

			of_serial_dir[i] = be32_to_cpup(&of_serial_dir32[i]);



		pdata->num_serializer = val;

		pdata->serial_dir = of_serial_dir;

	}