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: 1313091 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id C76DE3FC23 for ; Mon, 13 Aug 2012 14:22:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163Ab2HMOWs (ORCPT ); Mon, 13 Aug 2012 10:22:48 -0400 Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]:32980 "EHLO na3sys009aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752013Ab2HMOWr (ORCPT ); Mon, 13 Aug 2012 10:22:47 -0400 Received: from mail-ob0-f170.google.com ([209.85.214.170]) (using TLSv1) by na3sys009aob105.postini.com ([74.125.148.12]) with SMTP ID DSNKUCkNtuEIouH9gNZNxLe7yywX4NLF+Qm5@postini.com; Mon, 13 Aug 2012 07:22:47 PDT Received: by obbwc18 with SMTP id wc18so6384230obb.29 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=VgYHC7xm4I4P4rTbY5AmcSRO8oENSBowhLvak0Qxwtc31dU+MLt15ccyRB6nANAvqq Un/QdRIPjVthpWQkSJmNBAH02m4svBAgYFMLfO8g9elwHFqs4qKj/Nw8ugFC6yuLhDXq KG7miBlyHuD6n9/B8d8JzWbklhCtYzrhHoyYjB9TI8ZseFa6lWg7Sm/OrQWN/SPNY4Hz g2dyFkKSqQ+Rm0nsMN1OLHE1h8onDldve+vkxmXQDoOYXU97y4p8LeGzFmUUHdQGUh+z QTJQmABmA5fOxapIhittaMND40314C1Giha9xtafsJHLQXD2k+PFgcYoZzwjUB6emWMn plZA== 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 Cc: Jarkko Nikula , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson 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: ALoCoQlOhLAD3nFPuSXIvdeom7B7HpNG+KAAPt+6fMZote8A9rhftgwSoH6db+/ctPlb9C9+jxuY Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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 = {