Commit f755865f authored by Shawn Guo's avatar Shawn Guo

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
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/fsl/mxs-dma.h> #include <linux/fsl/mxs-dma.h>
#include <linux/pinctrl/consumer.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
...@@ -625,6 +626,7 @@ static int mxs_saif_probe(struct platform_device *pdev) ...@@ -625,6 +626,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
struct resource *iores, *dmares; struct resource *iores, *dmares;
struct mxs_saif *saif; struct mxs_saif *saif;
struct mxs_saif_platform_data *pdata; struct mxs_saif_platform_data *pdata;
struct pinctrl *pinctrl;
int ret = 0; int ret = 0;
if (pdev->id >= ARRAY_SIZE(mxs_saif)) if (pdev->id >= ARRAY_SIZE(mxs_saif))
...@@ -650,6 +652,12 @@ static int mxs_saif_probe(struct platform_device *pdev) ...@@ -650,6 +652,12 @@ static int mxs_saif_probe(struct platform_device *pdev)
saif->master_id = saif->id; 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); saif->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(saif->clk)) { if (IS_ERR(saif->clk)) {
ret = PTR_ERR(saif->clk); ret = PTR_ERR(saif->clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment