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

Commit a1c85ec0 authored by Richard Zhao's avatar Richard Zhao Committed by Mark Brown
Browse files

ASoC: imx-audmux: add pinctrl support 



Signed-off-by: default avatarRichard Zhao <richard.zhao@freescale.com>
Acked-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d298caae

sound/soc/fsl/imx-audmux.c

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

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/pinctrl/consumer.h>



#include "imx-audmux.h"
@@ -249,6 +250,7 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); 
static int __devinit imx_audmux_probe(struct platform_device *pdev)

{

	struct resource *res;

	struct pinctrl *pinctrl;

	const struct of_device_id *of_id =

			of_match_device(imx_audmux_dt_ids, &pdev->dev);
@@ -257,6 +259,12 @@ static int __devinit imx_audmux_probe(struct platform_device *pdev) 
	if (!audmux_base)

		return -EADDRNOTAVAIL;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		dev_err(&pdev->dev, "setup pinctrl failed!");

		return PTR_ERR(pinctrl);

	}



	audmux_clk = clk_get(&pdev->dev, "audmux");

	if (IS_ERR(audmux_clk)) {

		dev_dbg(&pdev->dev, "cannot get clock: %ld\n",