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

Commit 77882580 authored by Dong Aisheng's avatar Dong Aisheng Committed by Shawn Guo
Browse files

ASoC: mxs-saif: remove function in platform_data 



Add master_mode and master_id in platfrom_data since it's board
specific and board knows it.
Then we can remove the function pointer in platfrom_data to make
the driver more devicetree friendly.

Signed-off-by: default avatarDong Aisheng <b29396@freescale.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 5611cc45

include/sound/saif.h

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#define __SOUND_SAIF_H__



struct mxs_saif_platform_data {

	int (*init) (void);

	int (*get_master_id) (unsigned int saif_id);

	bool master_mode;	/* if true use master mode */

	int master_id;		/* id of the master if in slave mode */

};

#endif

sound/soc/mxs/mxs-saif.c

+9 −11
Original line number Diff line number Diff line
@@ -625,13 +625,6 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	if (pdev->id >= ARRAY_SIZE(mxs_saif))

		return -EINVAL;



	pdata = pdev->dev.platform_data;

	if (pdata && pdata->init) {

		ret = pdata->init();

		if (ret)

			return ret;

	}



	saif = kzalloc(sizeof(*saif), GFP_KERNEL);

	if (!saif)

		return -ENOMEM;
@@ -639,13 +632,18 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	mxs_saif[pdev->id] = saif;

	saif->id = pdev->id;



	saif->master_id = saif->id;

	if (pdata && pdata->get_master_id) {

		saif->master_id = pdata->get_master_id(saif->id);

	pdata = pdev->dev.platform_data;

	if (pdata && !pdata->master_mode) {

		saif->master_id = pdata->master_id;

		if (saif->master_id < 0 ||

			saif->master_id >= ARRAY_SIZE(mxs_saif))

			saif->master_id >= ARRAY_SIZE(mxs_saif) ||

			saif->master_id == saif->id) {

			dev_err(&pdev->dev, "get wrong master id\n");

			return -EINVAL;

		}

	} else {

		saif->master_id = saif->id;

	}



	saif->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(saif->clk)) {