From owner-svn-src-projects@FreeBSD.ORG  Mon Feb 20 00:30:20 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7FA69106566C;
	Mon, 20 Feb 2012 00:30:20 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BC628FC0C;
	Mon, 20 Feb 2012 00:30:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1K0UKnX022586;
	Mon, 20 Feb 2012 00:30:20 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1K0UKOQ022584;
	Mon, 20 Feb 2012 00:30:20 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201202200030.q1K0UKOQ022584@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 20 Feb 2012 00:30:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231920 - projects/armv6/sys/arm/ti/omap4
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Feb 2012 00:30:20 -0000

Author: gonzo
Date: Mon Feb 20 00:30:20 2012
New Revision: 231920
URL: http://svn.freebsd.org/changeset/base/231920

Log:
  - Change sDMA clock register offset
  - When enabling clocks use DELAY instead of busy loop

Modified:
  projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c

Modified: projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c
==============================================================================
--- projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c	Sun Feb 19 23:35:56 2012	(r231919)
+++ projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c	Mon Feb 20 00:30:20 2012	(r231920)
@@ -425,7 +425,7 @@ static struct omap4_clk_details g_omap4_
 		
 	/* sDMA block */
 	OMAP4_GENERIC_CLOCK_DETAILS(SDMA_CLK, -1, CM2_INSTANCE_MEM_REGION,
-		(CORE_CM2_OFFSET + 0x320), CLKCTRL_MODULEMODE_AUTO),
+		(CORE_CM2_OFFSET + 0x300), CLKCTRL_MODULEMODE_AUTO),
 
 	/* I2C modules */
 	OMAP4_GENERIC_CLOCK_DETAILS(I2C1_CLK, -1, CM2_INSTANCE_MEM_REGION,
@@ -445,7 +445,7 @@ static struct omap4_clk_details g_omap4_
  *	alive.
  *
  */
-#define MAX_MODULE_ENABLE_WAIT    1000
+#define MAX_MODULE_ENABLE_WAIT    100
 	
 /**
  *	ARRAY_SIZE - Macro to return the number of elements in a static const array.
@@ -529,6 +529,7 @@ omap4_clk_generic_activate(struct ti_clo
 		clksel = bus_read_4(clk_mem_res, clk_details->clksel_reg);
 		if ((clksel & CLKCTRL_IDLEST_MASK) == CLKCTRL_IDLEST_ENABLED)
 			break;
+		DELAY(10);
 	}
 		
 	/* Check the enabled state */