From patchwork Wed Aug 8 09:11:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1293591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 622653FC23 for ; Wed, 8 Aug 2012 09:16: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 1Sz2K5-0000gD-4t; Wed, 08 Aug 2012 09:13:01 +0000 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sz2JM-0000QE-7z for linux-arm-kernel@lists.infradead.org; Wed, 08 Aug 2012 09:12:17 +0000 Received: from mail-yx0-f182.google.com ([209.85.213.182]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKUCItbrjlxn8rFE7kkX4qPv3Xp8ei1GQt@postini.com; Wed, 08 Aug 2012 02:12:16 PDT Received: by yenl7 with SMTP id l7so511307yen.41 for ; Wed, 08 Aug 2012 02:12:14 -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=VR2M/scxGatl/yVY0L3CmyPEpGl/wcOWjlijPx+qtbs=; b=V2tXhQbthjpeCcQ8hMaa9plJhxQ8Kj0pJPx6k2slfhY9Nav2wrOa3dQKuDCRoaDH0d AP4h6GGhEWnJCQHZ/j9au0fvsPsjC7A3+GM6aOnpqLx1fG+Itvehw80ufIuWY2ZHNxNJ 2OVB+vxQwY9AMqMucqEiGUU30oqyS8OtKZKJgkTjzvAeNlCShKOOoXXdNXiqv/meQZ7s 3R9fKhgLPewG/HN/ip9TcwFa/2DyM98mcrZ9EY/DFr/8GeUvypJU5quLGmi3qLAb7d8h bHT6egXchDxGeracL6b2ONdcIAis0Jxk83tBqYJ0oFMW4zD6hC1KEE98tIwVssuCZKvc OIEg== Received: by 10.60.8.8 with SMTP id n8mr29608395oea.38.1344417133913; Wed, 08 Aug 2012 02:12:13 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id cp8sm22099007obc.23.2012.08.08.02.12.11 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:12:13 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Subject: [PATCH 05/11] ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing Date: Wed, 8 Aug 2012 12:11:35 +0300 Message-Id: <1344417101-5015-6-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344417101-5015-1-git-send-email-peter.ujfalusi@ti.com> References: <1344417101-5015-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQkvrb5dDi/wcOA0yupaMbYeT8dasdSs4vdOLCRi6PvCXv07Pf/NXlU4C4LusRjdAbgIQ9ML 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.71 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 --- 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 = {