From patchwork Thu Aug 16 13:41:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1332031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id D6884DFB34 for ; Thu, 16 Aug 2012 13:45:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T20KK-0005Ie-0W; Thu, 16 Aug 2012 13:41:32 +0000 Received: from na3sys009aog130.obsmtp.com ([74.125.149.143]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T20Jz-0005DQ-Uc for linux-arm-kernel@lists.infradead.org; Thu, 16 Aug 2012 13:41:12 +0000 Received: from mail-gg0-f180.google.com ([209.85.161.180]) (using TLSv1) by na3sys009aob130.postini.com ([74.125.148.12]) with SMTP ID DSNKUCz4dosvLTMPOapTeUMS2LY2ET7W1Jkz@postini.com; Thu, 16 Aug 2012 06:41:11 PDT Received: by ggmi2 with SMTP id i2so3062072ggm.11 for ; Thu, 16 Aug 2012 06:41:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=vFhqh5GciVbaM85+X+SQqNnfoUwgQHRrlnN/0QXQ17Y=; b=JXpc9tBBOySuMBIotcqlhavM7CheiT4wuf23pUTF4gFPmhN//3uJSk4hXlAMm0+zGI CJFHnplz8e3XDT6RAetsAfFDkidLZiGGQeoABAydX0inpOeL1oSBlmyeT8A6GlRNphry 7B//l+JeXt+7v15GGSn+9HodGT22TdzC7kJj87m49+CMI79/WcI3rU5boDriRxqJSLH1 v1vSfj8WT7QjHAQpnspKwCmA5HJvPtYXyGrQFCr8IzX9y4Nu0QYPgBSbNEsVjft5nAeh ZZxURvFpY31UNkvD86yh5LcTTezWr0r7KMnzRot1/1cu9wNkrYKDzkd0ImYikON8w0mR hx2Q== Received: by 10.60.20.99 with SMTP id m3mr949191oee.124.1345124469735; Thu, 16 Aug 2012 06:41:09 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id x10sm2977371oeb.8.2012.08.16.06.41.07 (version=SSLv3 cipher=OTHER); Thu, 16 Aug 2012 06:41:09 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Subject: [PATCH v3 4/9] ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing Date: Thu, 16 Aug 2012 16:41:03 +0300 Message-Id: <1345124468-8876-5-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1345124468-8876-1-git-send-email-peter.ujfalusi@ti.com> References: <1345124468-8876-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQkfuFmVMEAuSoC0FTq+RwyI0GEHQ/tZChKl2r91Z/aKXJR0ILS2OQLtOzuVSJp61GJcRyKN X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.143 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: alsa-devel@alsa-project.org, Benoit Cousson , devicetree-discuss@lists.ozlabs.org, Jarkko Nikula , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The muxing is done at board level, no need to do it in the ASoC machine driver. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Tony Lindgren --- sound/soc/omap/am3517evm.c | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index 009533a..a997988 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -47,26 +47,10 @@ static int am3517evm_hw_params(struct snd_pcm_substream *substream, /* Set the codec system clock for DAC and ADC */ ret = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_CLOCK, SND_SOC_CLOCK_IN); - if (ret < 0) { + if (ret < 0) printk(KERN_ERR "can't set codec system clock\n"); - return ret; - } - - ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0, - SND_SOC_CLOCK_IN); - if (ret < 0) { - printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_CLKR_SRC_CLKX\n"); - return ret; - } - snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0, - SND_SOC_CLOCK_IN); - if (ret < 0) { - printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_FSR_SRC_FSX\n"); - return ret; - } - - return 0; + return ret; } static struct snd_soc_ops am3517evm_ops = {