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

Commit f755865f authored by Shawn Guo's avatar Shawn Guo
Browse files

ASoC: mxs-saif: adopt pinctrl support 



Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d98d033c

sound/soc/mxs/mxs-saif.c

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/delay.h>

#include <linux/time.h>

#include <linux/fsl/mxs-dma.h>

#include <linux/pinctrl/consumer.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -625,6 +626,7 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	struct resource *iores, *dmares;

	struct mxs_saif *saif;

	struct mxs_saif_platform_data *pdata;

	struct pinctrl *pinctrl;

	int ret = 0;



	if (pdev->id >= ARRAY_SIZE(mxs_saif))
@@ -650,6 +652,12 @@ static int mxs_saif_probe(struct platform_device *pdev) 
		saif->master_id = saif->id;

	}



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		return ret;

	}



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

	if (IS_ERR(saif->clk)) {

		ret = PTR_ERR(saif->clk);