summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-05-06 23:00:50 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-05-12 09:43:18 +0800
commitf755865f9082a6632f06b8314068a883508d91ca (patch)
treef4705d28b829a3756779e8f8ac21e247768539e0 /sound/soc
parentd98d033c15b77d51ed723ba10c49fa13233e59c1 (diff)
downloadop-kernel-dev-f755865f9082a6632f06b8314068a883508d91ca.zip
op-kernel-dev-f755865f9082a6632f06b8314068a883508d91ca.tar.gz
ASoC: mxs-saif: adopt pinctrl support
Cc: alsa-devel@alsa-project.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/mxs/mxs-saif.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 53f4fd8..7fd224b 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -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);
OpenPOWER on IntegriCloud