diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2014-04-17 20:50:21 +0200 |
|---|---|---|
| committer | Chanho Park <cometzero@review.tizen.org> | 2014-04-22 01:31:31 -0700 |
| commit | 7ce85cce3725f31dda75a7a73709a0e06451bccb (patch) | |
| tree | 80345a30a0fbbf60b447dcccc0dbd161b37d2281 | |
| parent | 94ef1680cc7f7c5bfa03de066a9b89b5d53dcff9 (diff) | |
| download | linux-3.10-7ce85cce3725f31dda75a7a73709a0e06451bccb.tar.gz linux-3.10-7ce85cce3725f31dda75a7a73709a0e06451bccb.tar.bz2 linux-3.10-7ce85cce3725f31dda75a7a73709a0e06451bccb.zip | |
Revert "ASoC: samsung: Add pinctrl support to I2S driver"
This reverts commit 2b0c7de1eaf0e25c69ed1e4b21675ab97c6a4bdf,
which is not needed since pinctrl is handled by the driver core.
Change-Id: I0f204f15a39e07083375067fc828cf46bdb78360
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
| -rw-r--r-- | sound/soc/samsung/i2s.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 31936ac089d..9aa1628ca37 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -17,7 +17,6 @@ #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> @@ -1329,10 +1328,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) } if (np) { - struct pinctrl *pctrl; - pctrl = devm_pinctrl_get_select_default(&pdev->dev); - - if (IS_ERR(pctrl) && samsung_i2s_parse_dt_gpio(pri_dai)) { + if (samsung_i2s_parse_dt_gpio(pri_dai)) { dev_err(&pdev->dev, "Unable to configure gpio\n"); ret = -EINVAL; goto err; |