From patchwork Thu Aug 16 13:41:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1332021 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 EA2A040210 for ; Thu, 16 Aug 2012 13:45:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T20KW-0005MJ-Rc; Thu, 16 Aug 2012 13:41:44 +0000 Received: from na3sys009aog111.obsmtp.com ([74.125.149.205]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T20K3-0005Cj-6g for linux-arm-kernel@lists.infradead.org; Thu, 16 Aug 2012 13:41:18 +0000 Received: from mail-yx0-f175.google.com ([209.85.213.175]) (using TLSv1) by na3sys009aob111.postini.com ([74.125.148.12]) with SMTP ID DSNKUCz4c9DxUN6tyx59onwXaXmWIzl3Ru7j@postini.com; Thu, 16 Aug 2012 06:41:15 PDT Received: by yenm1 with SMTP id m1so3018284yen.20 for ; Thu, 16 Aug 2012 06:41:07 -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=TG7y4Iv42B374rzxaKZTPqBd8hxoVA0Jd+EA3RnjSQo=; b=MpaOCJfMOmKuoQe49A0x0OdscDD7SFzuWR8H24giWGdyTITiMeKR2lnbipVnYc964F DaugLmbxu8hRUPABmkmh7/gOo/76289JCewMrrF6HUOLFQZCgsujIQ7t4X27eAbCORQU t+ZMC0IOya+sArcnIFyBlomrOIldo7Hkh37q+DTQqemxQZWVx9Lbv+5CbGzN04hCMS0p PdQYry6d6xjQ2L1clgMklKoYiV6WmVE7B1VFANEYQgnC4sEIYZ9cwwq9JL3ZnadnF9Z5 1knTqz49qhZsagdo6o1IyqNtJE5S+bO6wcKTEhOeCbZ3vrcn5fiobz5Ms63SfREKBsJ+ k+TA== Received: by 10.60.13.232 with SMTP id k8mr968392oec.81.1345124467039; Thu, 16 Aug 2012 06:41:07 -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.04 (version=SSLv3 cipher=OTHER); Thu, 16 Aug 2012 06:41:06 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Subject: [PATCH v3 3/9] ARM: OMAP: board-am3517evm: Configure McBSP1 CLKR/FSR signal source Date: Thu, 16 Aug 2012 16:41:02 +0300 Message-Id: <1345124468-8876-4-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: ALoCoQmxBaYc6lo/W1JkoGndRj1j1s4Rn5F8MfNt4hvKKQkv05A2EBWFepQY7XytZV4CcG1heWjA 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.205 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 am3517evm board uses McBSP1 for audio with 4pin configuration. The CLKR/FSR signals need to be connected to CLKX/FSX pin of the SoC in this case. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Tony Lindgren --- arch/arm/mach-omap2/board-am3517evm.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 18f6010..592812a 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -264,6 +264,16 @@ static __init void am3517_evm_musb_init(void) usb_musb_init(&musb_board_data); } +static __init void am3517_evm_mcbsp1_init(void) +{ + u32 devconf0; + + /* McBSP1 CLKR/FSR signal to be connected to CLKX/FSX pin */ + devconf0 = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); + devconf0 |= OMAP2_MCBSP1_CLKR_MASK | OMAP2_MCBSP1_FSR_MASK; + omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0); +} + static const struct usbhs_omap_board_data usbhs_bdata __initconst = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, #if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \ @@ -373,6 +383,9 @@ static void __init am3517_evm_init(void) /* MUSB */ am3517_evm_musb_init(); + /* McBSP1 */ + am3517_evm_mcbsp1_init(); + /* MMC init function */ omap_hsmmc_init(mmc); }