From patchwork Mon Aug 13 14:22:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1313151 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 ECF7B3FC23 for ; Mon, 13 Aug 2012 14:23:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752588Ab2HMOXS (ORCPT ); Mon, 13 Aug 2012 10:23:18 -0400 Received: from na3sys009aog133.obsmtp.com ([74.125.149.82]:34679 "EHLO na3sys009aog133.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553Ab2HMOXP (ORCPT ); Mon, 13 Aug 2012 10:23:15 -0400 Received: from mail-ob0-f176.google.com ([209.85.214.176]) (using TLSv1) by na3sys009aob133.postini.com ([74.125.148.12]) with SMTP ID DSNKUCkNuJ12OkrqCQ7vaeLIi8e4xGzMuEZs@postini.com; Mon, 13 Aug 2012 07:23:15 PDT Received: by obbtb18 with SMTP id tb18so6572048obb.7 for ; Mon, 13 Aug 2012 07:22:43 -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=XASIJlHgByebi1aQbMxxfrYGeEsF4Sm2c51StJN2CIyGGU21wakLMt397ilRLxTXtW GX8WvOgTEnLjrVLmVsuSb8s9Pi574D/Cev8e6VV2uoYal9WMj1Ov39Yt6/ZAUYRuNq7K sYVXF8QFarkfhhN8z94kWqvMeEdZSdGzdwWdO2KKZAtw8dKi0ZiBZFQXHyz+NEXJJvv3 Y1hufK6ebfNSRvtUpX9btunm5sh3lJSki20CrIqgw6Oi6J158S/o4yi+8NjfFZTqvrx6 OWtKgo5atrH8p4mU0uetcSlxDguv3kqtbVR67rfifv8674q6DMuqdXQBAqQ6R58QkwRN AFwQ== Received: by 10.182.0.13 with SMTP id 13mr12067273oba.55.1344867762974; Mon, 13 Aug 2012 07:22:42 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id th3sm6355591obb.6.2012.08.13.07.22.40 (version=SSLv3 cipher=OTHER); Mon, 13 Aug 2012 07:22:42 -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 v2 3/9] ARM: OMAP: board-am3517evm: Configure McBSP1 CLKR/FSR signal source Date: Mon, 13 Aug 2012 17:22:42 +0300 Message-Id: <1344867768-26335-4-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344867768-26335-1-git-send-email-peter.ujfalusi@ti.com> References: <1344867768-26335-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQlEsakNHMUHMrC888gKeGIaeV8vyPDyrPOA6mpyzCzWgqqWaxkRm0noJeMuWlXPi8TFEfjs 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 --- 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); }