From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 22 22:45:50 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 66C42106566B;
	Wed, 22 Feb 2012 22:45:50 +0000 (UTC)
	(envelope-from dmarion@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5631E8FC08;
	Wed, 22 Feb 2012 22:45:50 +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 q1MMjoFt072465;
	Wed, 22 Feb 2012 22:45:50 GMT (envelope-from dmarion@svn.freebsd.org)
Received: (from dmarion@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1MMjoSh072463;
	Wed, 22 Feb 2012 22:45:50 GMT (envelope-from dmarion@svn.freebsd.org)
Message-Id: <201202222245.q1MMjoSh072463@svn.freebsd.org>
From: Damjan Marion <dmarion@FreeBSD.org>
Date: Wed, 22 Feb 2012 22:45:50 +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: r232012 - projects/armv6/sys/arm/ti/am335x
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: Wed, 22 Feb 2012 22:45:50 -0000

Author: dmarion
Date: Wed Feb 22 22:45:49 2012
New Revision: 232012
URL: http://svn.freebsd.org/changeset/base/232012

Log:
  am335x reset function
  
  Approved by:  cognet (mentor)

Modified:
  projects/armv6/sys/arm/ti/am335x/am335x_prcm.c

Modified: projects/armv6/sys/arm/ti/am335x/am335x_prcm.c
==============================================================================
--- projects/armv6/sys/arm/ti/am335x/am335x_prcm.c	Wed Feb 22 22:40:20 2012	(r232011)
+++ projects/armv6/sys/arm/ti/am335x/am335x_prcm.c	Wed Feb 22 22:45:49 2012	(r232012)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/intr.h>
 
+#include <arm/ti/tivar.h>
 #include <arm/ti/ti_scm.h>
 #include <arm/ti/ti_prcm.h>
 
@@ -78,6 +79,8 @@ __FBSDID("$FreeBSD$");
 #define CLKSEL_TIMER5_CLK		(CM_DPLL + 0x018)
 #define CLKSEL_TIMER6_CLK		(CM_DPLL + 0x01C)
 
+#define PRM_DEVICE_OFFSET		0xF00
+#define PRM_RSTCTRL			(PRM_DEVICE_OFFSET + 0x00)
 
 struct am335x_prcm_softc {
 	struct resource *	res[2];
@@ -97,6 +100,7 @@ static int am335x_clk_generic_deactivate
 static int am335x_clk_generic_set_source(struct ti_clock_dev *clkdev, clk_src_t clksrc);
 static int am335x_clk_get_sysclk_freq(struct ti_clock_dev *clkdev, unsigned int *freq);
 static int am335x_clk_get_arm_fclk_freq(struct ti_clock_dev *clkdev, unsigned int *freq);
+static void am335x_prcm_reset(void);
 static int am335x_clk_cpsw_activate(struct ti_clock_dev *clkdev);
 
 #define AM335X_GENERIC_CLOCK_DEV(i) \
@@ -220,6 +224,7 @@ am335x_prcm_attach(device_t dev)
 	sc->bsh = rman_get_bushandle(sc->res[0]);
 
 	am335x_prcm_sc = sc;
+	ti_cpu_reset = am335x_prcm_reset;
 
 	am335x_clk_get_sysclk_freq(NULL, &sysclk);
 	am335x_clk_get_arm_fclk_freq(NULL, &fclk);
@@ -392,6 +397,12 @@ am335x_clk_get_arm_fclk_freq(struct ti_c
 	return(0);
 }
 
+static void
+am335x_prcm_reset(void)
+{
+	prcm_write_4(PRM_RSTCTRL, (1<<1));
+}
+
 static int
 am335x_clk_cpsw_activate(struct ti_clock_dev *clkdev)
 {