From patchwork Wed May 9 11:33:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 8486 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 764C123E9A for ; Wed, 9 May 2012 11:33:41 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 464C4A184A3 for ; Wed, 9 May 2012 11:33:41 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so162549yhp.11 for ; Wed, 09 May 2012 04:33:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :x-spamscore:x-bigfish:x-forefront-antispam-report:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-originatororg:x-gm-message-state; bh=npzpSHbIUAbPnUNpzUXva+U/9liYLzs2CWsAzYVZiEQ=; b=I7/yd7ZoBr3nQ4JsOMzJsWqm8g4W7v7vCBNDJZld+qccO0iB9Hb23t7OBp3xy4JcBS D0N/s5f82ZfKHmpzrJGdGnqee+56VRHKO8MjFaRTtF/mCcmGdNoNnRLwVP/IcmoKtwEG wmev33Qq//IQ1B51MixTdlrfXld7/zXOLP1Nbv3LGNVVO5Cz5mqiGK9fPOFOz++aMjli 3lHQD73VZ05T06eMqq9TQlHh7uxeaBYsAQTFtLm5OvUvQ/TMKNro1qgd8OtdX1Vl33lP p/hYxZ2Joc5i+D72IIFl9brv2tZsAP2kwfCkgwd1mf9ogS24gHbo8qdfQxsrUt4G85Vp Ousg== Received: by 10.50.57.129 with SMTP id i1mr12910507igq.33.1336563220794; Wed, 09 May 2012 04:33:40 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp8628ibj; Wed, 9 May 2012 04:33:39 -0700 (PDT) Received: by 10.180.97.4 with SMTP id dw4mr6043478wib.18.1336563219534; Wed, 09 May 2012 04:33:39 -0700 (PDT) Received: from tx2outboundpool.messaging.microsoft.com (tx2ehsobe001.messaging.microsoft.com. [65.55.88.11]) by mx.google.com with ESMTPS id l2si18093072wiw.41.2012.05.09.04.33.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 May 2012 04:33:39 -0700 (PDT) Received-SPF: neutral (google.com: 65.55.88.11 is neither permitted nor denied by best guess record for domain of B20223@freescale.com) client-ip=65.55.88.11; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.11 is neither permitted nor denied by best guess record for domain of B20223@freescale.com) smtp.mail=B20223@freescale.com Received: from mail74-tx2-R.bigfish.com (10.9.14.248) by TX2EHSOBE010.bigfish.com (10.9.40.30) with Microsoft SMTP Server id 14.1.225.23; Wed, 9 May 2012 11:33:37 +0000 Received: from mail74-tx2 (localhost [127.0.0.1]) by mail74-tx2-R.bigfish.com (Postfix) with ESMTP id 866882600B5; Wed, 9 May 2012 11:33:37 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839hd24he5bh) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail74-tx2 (localhost.localdomain [127.0.0.1]) by mail74-tx2 (MessageSwitch) id 1336563215408391_13198; Wed, 9 May 2012 11:33:35 +0000 (UTC) Received: from TX2EHSMHS031.bigfish.com (unknown [10.9.14.247]) by mail74-tx2.bigfish.com (Postfix) with ESMTP id 57A184800BB; Wed, 9 May 2012 11:33:35 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS031.bigfish.com (10.9.99.131) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 9 May 2012 11:33:19 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.355.3; Wed, 9 May 2012 06:33:32 -0500 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id q49BXDtN001540; Wed, 9 May 2012 06:33:28 -0500 (CDT) From: Richard Zhao To: , , CC: , , , , , , , , , , Richard Zhao Subject: [PATCH V2 03/11] ASoC: imx-audmux: add pinctrl support Date: Wed, 9 May 2012 19:33:02 +0800 Message-ID: <1336563190-19974-4-git-send-email-richard.zhao@freescale.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1336563190-19974-1-git-send-email-richard.zhao@freescale.com> References: <1336563190-19974-1-git-send-email-richard.zhao@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-Gm-Message-State: ALoCoQkSRsmDmTkRjyL93qcB8I+C24TNSbcOoJgIUcUe/KsmTdkEr3xtaufwh6Q098w/nDy8Igax Signed-off-by: Richard Zhao --- 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 #include #include +#include #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",