From patchwork Mon Aug 13 14:22:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1313251 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 8CF34DF223 for ; Mon, 13 Aug 2012 14:28:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T0vZv-0004wf-F4; Mon, 13 Aug 2012 14:25:13 +0000 Received: from na3sys009aog134.obsmtp.com ([74.125.149.83]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T0vYS-0003pA-5q for linux-arm-kernel@lists.infradead.org; Mon, 13 Aug 2012 14:23:43 +0000 Received: from mail-ob0-f182.google.com ([209.85.214.182]) (using TLSv1) by na3sys009aob134.postini.com ([74.125.148.12]) with SMTP ID DSNKUCkNwXYMIOkpKfvCW9xuW6vF4oyoiGvP@postini.com; Mon, 13 Aug 2012 07:23:40 PDT Received: by obbun3 with SMTP id un3so7021366obb.41 for ; Mon, 13 Aug 2012 07:22:45 -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=X4JSCT0JPe4tgdOibx3QQ4LtS3rfaavzB/AYVuNiMFpOg65CJZ6wr8dlBZuShU1XTX 5+e6OOyBdRoC8PcKnOWzzZ+DRuc9L8rBnHBbIcob8YHgKbLyLMAMIRufd1BCNk4Lemn1 TvdwsGBxraxzayfbrBky/Es4fE1c/0aKaXSXAd+pCAegf8uHEJOL+k5/Ut2HyzZ3xL4g E2fdMAcj7FyjTEJD6S925pXYwrPTYWgIX21xWwR7qRJRBK75A4hzcvtqHnd+OwEp/i6N IZ5K+jhwd24ashUIEsDPmvIoZ4zI1mWjoeVFNJfQlhfotVTCsb1WEItpYvoC3PODRdco 2KQw== Received: by 10.182.49.7 with SMTP id q7mr12158027obn.68.1344867765841; Mon, 13 Aug 2012 07:22:45 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id th3sm6355591obb.6.2012.08.13.07.22.43 (version=SSLv3 cipher=OTHER); Mon, 13 Aug 2012 07:22:45 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Subject: [PATCH v2 4/9] ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing Date: Mon, 13 Aug 2012 17:22:43 +0300 Message-Id: <1344867768-26335-5-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344867768-26335-1-git-send-email-peter.ujfalusi@ti.com> References: <1344867768-26335-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQlKmzuHoans9deMj3CRo45/N/VbjS8ZwN0LFUJZIfJ7pC65xu9ziIoAh+ZfEj8NZNZaIzTt 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.83 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 --- 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 = {