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: 1331941 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 25FDF40210 for ; Thu, 16 Aug 2012 13:41:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753937Ab2HPNlM (ORCPT ); Thu, 16 Aug 2012 09:41:12 -0400 Received: from na3sys009aog105.obsmtp.com ([74.125.149.75]:56665 "EHLO na3sys009aog105.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753853Ab2HPNlL (ORCPT ); Thu, 16 Aug 2012 09:41:11 -0400 Received: from mail-qa0-f43.google.com ([209.85.216.43]) (using TLSv1) by na3sys009aob105.postini.com ([74.125.148.12]) with SMTP ID DSNKUCz4dosvLTMPOapTeUMS2LY2ET7W1Jkz@postini.com; Thu, 16 Aug 2012 06:41:11 PDT Received: by qatk31 with SMTP id k31so804771qat.16 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=Gt9k1fUrcPefVPtPxYDwvGPu2yH+If4oCnulaTZkmmxM8KsCWq+fIU+XIe6kjUjWQ+ 8RCLq6BBXMhxtGqhcruIOwO+OHPsnKY1hfPpFg+Mr/92z747QVcOCcoJ2CH0Aec8xHll B72VqmKLyk9ynCp1liImlO98mQqxTwXU0+2UWG3dcDNPfSPXU5juc/IOjbahUJHWtpNW iPPEhvHkpDra3WkkPRRndK1iOGnPghyJs4HDOHX2LX45ZH26HisiQr4ZX6QhTAeWZTXG m0zOaOOll0ztUM+HzycUiOzwIC75qEz2ZlltE6xBXSkRjQJMLpQoZQVSDm3AaLm9ovCO Skwg== 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 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 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: ALoCoQnuDyc9DtyquSLgS6OznG1zsKj82GjwudUo0ZoWKQxCsb7fMQ+dVlqh3cdch1wbsgnQU2hX 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 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 = {