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: 1293491 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 6EE673FCFC for ; Wed, 8 Aug 2012 09:12:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757901Ab2HHJMR (ORCPT ); Wed, 8 Aug 2012 05:12:17 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:54059 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964895Ab2HHJMP (ORCPT ); Wed, 8 Aug 2012 05:12:15 -0400 Received: from mail-yx0-f175.google.com ([209.85.213.175]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKUCItbrjlxn8rFE7kkX4qPv3Xp8ei1GQt@postini.com; Wed, 08 Aug 2012 02:12:15 PDT Received: by yenm1 with SMTP id m1so486111yen.6 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=cMCXN3orjpFRbxHyGtirJ64IYwFJHSqCHcWxqrwkVCkgK2wGnl4Y5fZNba+l0xgmLw RE0TdQdyFuHM7MdGmhLv0og2VPtvxUtGGeTn9yV7emPMOaDASb4eLSkrUlFifsuOxzvV ozJUFyqKnFVfgpzP1oJc5jtXomuLBJJuD2Gavs3P6F1jXfx5VkvWT1IrV3BDUL1vVo5Q 40UFcAlFKLW7irwNpdqonIL/+jtMUwTNyfcoJr6QxNaPMmxhB+YoqoD1E0epjofEUE5U lR4CK83ax7bGZ//OyiOHIgBdzvoj+tpTOU+f8CAvXOib+49VzpzLSlBwF/5HYbqtzwfI 9wuw== 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 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 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: ALoCoQm9dxl0prJ0168xDWtQnhl5amdU6+IyH0KLiY7J+ETSwoFEPfzl3aCEh9r6rBz2ruxmgH9e 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 --- 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 = {