From patchwork Thu Nov 22 04:04:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hebbar, Gururaja" X-Patchwork-Id: 1782901 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork2.kernel.org (Postfix) with ESMTP id 5038CDF24C for ; Thu, 22 Nov 2012 04:05:32 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id qAM45VFk015265 for ; Wed, 21 Nov 2012 22:05:31 -0600 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAM45V0U018162 for ; Wed, 21 Nov 2012 22:05:31 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Wed, 21 Nov 2012 22:05:31 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAM45VMY012979 for ; Wed, 21 Nov 2012 22:05:31 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 36E9C80628 for ; Wed, 21 Nov 2012 22:05:31 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dbdp20.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by linux.omap.com (Postfix) with ESMTP id 82B2280628 for ; Wed, 21 Nov 2012 22:05:19 -0600 (CST) Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAM45BvR016687; Thu, 22 Nov 2012 09:35:12 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Thu, 22 Nov 2012 09:35:11 +0530 Received: from ucmsshproxy.india.ext.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with SMTP id qAM454mR031952; Thu, 22 Nov 2012 09:35:04 +0530 Received: from symphony.india.ext.ti.com (unknown [192.168.247.13]) by ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP id 19982158003; Thu, 22 Nov 2012 09:35:04 +0530 (IST) Received: from localhost.localdomain (ubuntu-psp-linux [192.168.247.46]) by symphony.india.ext.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id qAM453q22481; Thu, 22 Nov 2012 09:35:03 +0530 (IST) From: "Hebbar, Gururaja" To: , , Subject: [PATCH 1/2] ASoC: davinci-mcasp: Add pinctrl support Date: Thu, 22 Nov 2012 09:34:58 +0530 Message-ID: <1353557099-21599-2-git-send-email-gururaja.hebbar@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1353557099-21599-1-git-send-email-gururaja.hebbar@ti.com> References: <1353557099-21599-1-git-send-email-gururaja.hebbar@ti.com> MIME-Version: 1.0 CC: , , , , , , , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com From: "Hebbar, Gururaja" Signed-off-by: Hebbar, Gururaja --- :100644 100644 5715595... 76c05d9... M sound/soc/davinci/davinci-mcasp.c sound/soc/davinci/davinci-mcasp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 5715595..76c05d9 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -1108,6 +1109,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) struct resource *mem, *ioarea, *res; struct snd_platform_data *pdata; struct davinci_audio_dev *dev; + struct pinctrl *pinctrl; int ret; if (!pdev->dev.platform_data && !pdev->dev.of_node) { @@ -1139,6 +1141,11 @@ static int davinci_mcasp_probe(struct platform_device *pdev) return -EBUSY; } + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) + dev_warn(&pdev->dev, + "pins are not configured from the driver\n"); + pm_runtime_enable(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev);