diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-02-14 18:33:26 +0100 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-03-20 17:32:21 +0900 |
| commit | 2b0c7de1eaf0e25c69ed1e4b21675ab97c6a4bdf (patch) | |
| tree | 7f6975d18cee48a5d82deda87f4cdff597917cfc /sound | |
| parent | d3cc0912604cdc1a8c0075fa207ffad594b72e92 (diff) | |
| download | linux-3.10-2b0c7de1eaf0e25c69ed1e4b21675ab97c6a4bdf.tar.gz linux-3.10-2b0c7de1eaf0e25c69ed1e4b21675ab97c6a4bdf.tar.bz2 linux-3.10-2b0c7de1eaf0e25c69ed1e4b21675ab97c6a4bdf.zip | |
ASoC: samsung: Add pinctrl support to I2S driver
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/i2s.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 82ebb1a5147..78472d26615 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_gpio.h> +#include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h> #include <sound/soc.h> @@ -1236,7 +1237,10 @@ static int samsung_i2s_probe(struct platform_device *pdev) } if (np) { - if (samsung_i2s_parse_dt_gpio(pri_dai)) { + struct pinctrl *pctrl; + pctrl = devm_pinctrl_get_select_default(&pdev->dev); + + if (IS_ERR(pctrl) && samsung_i2s_parse_dt_gpio(pri_dai)) { dev_err(&pdev->dev, "Unable to configure gpio\n"); ret = -EINVAL; goto err; |