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: 1331931 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E77EDDFB34 for ; Thu, 16 Aug 2012 13:41:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753755Ab2HPNlJ (ORCPT ); Thu, 16 Aug 2012 09:41:09 -0400 Received: from na3sys009aog128.obsmtp.com ([74.125.149.141]:44089 "EHLO na3sys009aog128.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752461Ab2HPNlI (ORCPT ); Thu, 16 Aug 2012 09:41:08 -0400 Received: from mail-gg0-f175.google.com ([209.85.161.175]) (using TLSv1) by na3sys009aob128.postini.com ([74.125.148.12]) with SMTP ID DSNKUCz4c9DxUN6tyx59onwXaXmWIzl3Ru7j@postini.com; Thu, 16 Aug 2012 06:41:08 PDT Received: by ggmq1 with SMTP id q1so3024907ggm.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=kzqGs8/0/T0HhwFA1XkBnIfyuwRDsvQRbtMvqTiahRrg09X1i3wFeDI6eFU/QV+Kv/ NPDD5dYvXmthNRIr9JKr6p8UKYQkQkH0O7QJ/g7jdUcbYk4qL9L5cIg+wkzkDeQjsgNY DyeixHbgREHtTJByrNWp6TMXGYeD0boiapJ5mXdInRrxCjr+/8QSV80tFJK425d+GuEW BwMJgxTVwwgHspROtAu9IYGktmqJQdwZ9IaIIB0R5miZeB8qUakvMRbpFiHPVoxoCd41 zDgvEf0BThRFrYBtj1Y7nX3/7eF8eFdi2E6+G7BS39QEhW40U6++XS1nqY2Kbfk2kezH l6zA== 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 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 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: ALoCoQmUmA8rbj6sZALyrap1Fmf4fgcZ2LCqxXZo2hxccyZxhdAtysnLGx0xdH2aw5025Vibm7MX Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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); }