linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: richard.zhao@freescale.com (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support
Date: Wed, 9 May 2012 19:33:02 +0800	[thread overview]
Message-ID: <1336563190-19974-4-git-send-email-richard.zhao@freescale.com> (raw)
In-Reply-To: <1336563190-19974-1-git-send-email-richard.zhao@freescale.com>

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
 sound/soc/fsl/imx-audmux.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index f237003..0803274 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -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",
-- 
1.7.5.4

  parent reply	other threads:[~2012-05-09 11:33 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-09 11:32 [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support Richard Zhao
2012-05-09 11:33 ` [PATCH V2 01/11] dma: imx-sdma: make channel0 operations atomic Richard Zhao
2012-05-10  3:53   ` Vinod Koul
2012-05-10  6:34     ` Shawn Guo
2012-05-10 12:37       ` Shawn Guo
2012-05-11  2:52         ` Vinod Koul
2012-05-11  3:02           ` Shawn Guo
2012-05-11  6:32   ` Vinod Koul
2012-05-11  7:14     ` [PATCH Rebase 1/1] " Richard Zhao
2012-05-11  8:33       ` [alsa-devel] " Vinod Koul
2012-05-09 11:33 ` [PATCH V2 02/11] ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support Richard Zhao
2012-05-10  6:20   ` Dong Aisheng
2012-05-09 11:33 ` Richard Zhao [this message]
2012-05-09 16:00   ` [PATCH V2 03/11] ASoC: imx-audmux: add " Mark Brown
2012-05-10  0:35     ` Richard Zhao
2012-05-10  6:39       ` Shawn Guo
2012-05-10  8:44         ` Mark Brown
2012-05-10  9:05           ` Richard Zhao
2012-05-10  9:27             ` Mark Brown
2012-05-10 10:23               ` Richard Zhao
2012-05-10 12:26                 ` Linus Walleij
2012-05-10 13:41                   ` Richard Zhao
2012-05-10 14:00                     ` Linus Walleij
2012-05-11  5:32                   ` Shawn Guo
2012-05-11 12:29                     ` Linus Walleij
2012-05-11 13:27                       ` Arnd Bergmann
2012-05-10 15:48             ` [alsa-devel] " Stephen Warren
2012-05-10  9:07           ` Shawn Guo
2012-05-10  9:25             ` Mark Brown
2012-05-10 12:32               ` Shawn Guo
2012-05-10 12:20             ` Linus Walleij
2012-05-10  3:28   ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 04/11] ARM: dts: imx6q-sabrelite: add audmux " Richard Zhao
2012-05-10  3:29   ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 05/11] ARM: imx6q: add ssi1_ipg clk_lookup Richard Zhao
2012-05-09 11:33 ` [PATCH V2 06/11] ASoC: fsl_ssi: convert to use devm_clk_get Richard Zhao
2012-05-09 11:50   ` Mark Brown
2012-05-09 11:59     ` Shawn Guo
2012-05-09 12:01       ` Mark Brown
2012-05-09 12:03       ` Shawn Guo
2012-05-09 16:09   ` Timur Tabi
2012-05-09 11:33 ` [PATCH V2 07/11] ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 Richard Zhao
2012-05-09 11:33 ` [PATCH V2 08/11] ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000 Richard Zhao
2012-05-10  6:48   ` Shawn Guo
2012-05-10  9:34     ` Richard Zhao
2012-05-10  9:41       ` Shawn Guo
2012-05-10  9:45         ` Mark Brown
2012-05-10 10:18           ` Richard Zhao
2012-05-10 11:49           ` Shawn Guo
2012-05-10 15:48             ` [alsa-devel] " Shawn Guo
2012-05-10  9:45         ` Shawn Guo
2012-05-09 11:33 ` [PATCH V2 09/11] ARM: dts: imx6q-sabrelite: add serial2 pinctrl support Richard Zhao
2012-05-10  3:33   ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 10/11] ARM: imx6q: change clkdev device name from xxxx.uart to xxxx.serial Richard Zhao
2012-05-10  6:51   ` Shawn Guo
2012-05-09 11:33 ` [PATCH V2 11/11] ARM: imx6q: change clkdev device name from xxxx.enet to xxxx.ethernet Richard Zhao
2012-05-11  6:30 ` [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support Shawn Guo
2012-05-21 12:59 ` Richard Zhao
2012-05-21 14:45   ` Mark Brown
2012-05-22  1:39     ` Richard Zhao
2012-05-22  9:56       ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1336563190-19974-4-git-send-email-richard.zhao@freescale.com \
    --to=richard.zhao@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).