Thu Feb 20 21:46:14 2014 UTC ()
Include gtmr_var.h


(matt)
diff -r1.6 -r1.7 src/sys/arch/arm/allwinner/awin_board.c
cvs diff -r1.6 -r1.7 src/sys/arch/arm/allwinner/Attic/awin_board.c (expand / switch to unified diff)

--- src/sys/arch/arm/allwinner/Attic/awin_board.c 2013/09/09 17:53:36 1.6
+++ src/sys/arch/arm/allwinner/Attic/awin_board.c 2014/02/20 21:46:14 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: awin_board.c,v 1.6 2013/09/09 17:53:36 matt Exp $ */ 1/* $NetBSD: awin_board.c,v 1.7 2014/02/20 21:46:14 matt Exp $ */
2/*- 2/*-
3 * Copyright (c) 2012 The NetBSD Foundation, Inc. 3 * Copyright (c) 2012 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Matt Thomas of 3am Software Foundry. 7 * by Matt Thomas of 3am Software Foundry.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -24,43 +24,45 @@ @@ -24,43 +24,45 @@
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 * POSSIBILITY OF SUCH DAMAGE. 28 * POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31#include "opt_allwinner.h" 31#include "opt_allwinner.h"
32 32
33#define _ARM32_BUS_DMA_PRIVATE 33#define _ARM32_BUS_DMA_PRIVATE
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36 36
37__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.6 2013/09/09 17:53:36 matt Exp $"); 37__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.7 2014/02/20 21:46:14 matt Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/bus.h> 40#include <sys/bus.h>
41#include <sys/cpu.h> 41#include <sys/cpu.h>
42#include <sys/device.h> 42#include <sys/device.h>
43 43
44#include <prop/proplib.h> 44#include <prop/proplib.h>
45 45
46#include <net/if.h> 46#include <net/if.h>
47#include <net/if_ether.h> 47#include <net/if_ether.h>
48 48
49#include <arm/mainbus/mainbus.h> 49#include <arm/mainbus/mainbus.h>
50 50
51#include <arm/allwinner/awin_reg.h> 51#include <arm/allwinner/awin_reg.h>
52#include <arm/allwinner/awin_var.h> 52#include <arm/allwinner/awin_var.h>
53 53
 54#include <arm/cortex/gtmr_var.h>
 55
54bus_space_handle_t awin_core_bsh; 56bus_space_handle_t awin_core_bsh;
55 57
56struct arm32_bus_dma_tag awin_dma_tag = { 58struct arm32_bus_dma_tag awin_dma_tag = {
57 _BUS_DMAMAP_FUNCS, 59 _BUS_DMAMAP_FUNCS,
58 _BUS_DMAMEM_FUNCS, 60 _BUS_DMAMEM_FUNCS,
59 _BUS_DMATAG_FUNCS, 61 _BUS_DMATAG_FUNCS,
60}; 62};
61 63
62#ifdef AWIN_CONSOLE_EARLY 64#ifdef AWIN_CONSOLE_EARLY
63#include <dev/ic/ns16550reg.h> 65#include <dev/ic/ns16550reg.h>
64#include <dev/ic/comreg.h> 66#include <dev/ic/comreg.h>
65#include <dev/cons.h> 67#include <dev/cons.h>
66 68