From owner-svn-src-all@FreeBSD.ORG  Mon Feb 11 11:33:57 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A2F28B61;
 Mon, 11 Feb 2013 11:33:57 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 919721F44;
 Mon, 11 Feb 2013 11:33:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BBXvA1072775;
 Mon, 11 Feb 2013 11:33:57 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BBXvFC072774;
 Mon, 11 Feb 2013 11:33:57 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201302111133.r1BBXvFC072774@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 11 Feb 2013 11:33:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246661 - head/sys/arm/allwinner
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Feb 2013 11:33:57 -0000

Author: gonzo
Date: Mon Feb 11 11:33:56 2013
New Revision: 246661
URL: http://svnweb.freebsd.org/changeset/base/246661

Log:
  A10 reset mechanism is the same for all boards in this family so remove
  redundant reset function implementation pointer. We might want to
  ressurect it later when support for other Allwinner chips is introduced.

Modified:
  head/sys/arm/allwinner/a10_machdep.c

Modified: head/sys/arm/allwinner/a10_machdep.c
==============================================================================
--- head/sys/arm/allwinner/a10_machdep.c	Mon Feb 11 11:31:23 2013	(r246660)
+++ head/sys/arm/allwinner/a10_machdep.c	Mon Feb 11 11:33:56 2013	(r246661)
@@ -49,16 +49,16 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/fdt/fdt_common.h>
 
+#include <arm/allwinner/a10_wdog.h>
+
 /* Start of address space used for bootstrap map */
 #define DEVMAP_BOOTSTRAP_MAP_START      0xE0000000
 
-void (*a10_cpu_reset)(void);
 
 vm_offset_t
 initarm_lastaddr(void)
 {
 
-	a10_cpu_reset = NULL;
 	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
 }
 
@@ -113,10 +113,7 @@ bus_dma_get_range_nb(void)
 void
 cpu_reset()
 {
-	if (a10_cpu_reset)
-		(*a10_cpu_reset)();
-	else
-		printf("no cpu_reset implementation\n");
+	a10wd_watchdog_reset();
 	printf("Reset failed!\n");
 	while (1);
 }