Module Name: src
Committed By: matt
Date: Sun Jun 16 17:47:54 UTC 2013
Modified Files:
src/sys/arch/arm/omap: obio_mputmr.c obio_ohci.c omap2_mputmr.c
omap3_ehci.c
Log Message:
#include <arm/omap/omap_var.h> where appropriate
Remove unneeded frequency check
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/obio_mputmr.c \
src/sys/arch/arm/omap/omap3_ehci.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/obio_ohci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/omap/omap2_mputmr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/obio_mputmr.c
diff -u src/sys/arch/arm/omap/obio_mputmr.c:1.7 src/sys/arch/arm/omap/obio_mputmr.c:1.8
--- src/sys/arch/arm/omap/obio_mputmr.c:1.7 Wed Jan 16 03:30:48 2013
+++ src/sys/arch/arm/omap/obio_mputmr.c Sun Jun 16 17:47:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_mputmr.c,v 1.7 2013/01/16 03:30:48 jmcneill Exp $ */
+/* $NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $ */
/*
* Based on omap_mputmr.c
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.7 2013/01/16 03:30:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $");
#include "opt_omap.h"
#include "opt_cpuoptions.h"
@@ -128,10 +128,6 @@ __KERNEL_RCSID(0, "$NetBSD: obio_mputmr.
#include <arm/omap/omap2_reg.h>
-#ifndef OMAP_MPU_TIMER_CLOCK_FREQ
-#error Specify the timer frequency in Hz with the OMAP_MPU_TIMER_CLOCK_FREQ option.
-#endif
-
typedef struct {
uint gptn;
bus_addr_t addr;
Index: src/sys/arch/arm/omap/omap3_ehci.c
diff -u src/sys/arch/arm/omap/omap3_ehci.c:1.7 src/sys/arch/arm/omap/omap3_ehci.c:1.8
--- src/sys/arch/arm/omap/omap3_ehci.c:1.7 Sun Jun 16 16:42:13 2013
+++ src/sys/arch/arm/omap/omap3_ehci.c Sun Jun 16 17:47:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_ehci.c,v 1.7 2013/06/16 16:42:13 matt Exp $ */
+/* $NetBSD: omap3_ehci.c,v 1.8 2013/06/16 17:47:54 matt Exp $ */
/*-
* Copyright (c) 2010-2012 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.7 2013/06/16 16:42:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.8 2013/06/16 17:47:54 matt Exp $");
#include "locators.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c
#include <dev/usb/ehcireg.h>
#include <dev/usb/ehcivar.h>
+#include <arm/omap/omap_var.h>
#include <arm/omap/omap2_gpio.h>
#include <arm/omap/omap2_obioreg.h>
#include <arm/omap/omap2_obiovar.h>
Index: src/sys/arch/arm/omap/obio_ohci.c
diff -u src/sys/arch/arm/omap/obio_ohci.c:1.8 src/sys/arch/arm/omap/obio_ohci.c:1.9
--- src/sys/arch/arm/omap/obio_ohci.c:1.8 Sat Oct 27 17:17:40 2012
+++ src/sys/arch/arm/omap/obio_ohci.c Sun Jun 16 17:47:54 2013
@@ -1,7 +1,7 @@
-/* $Id: obio_ohci.c,v 1.8 2012/10/27 17:17:40 chs Exp $ */
+/* $Id: obio_ohci.c,v 1.9 2013/06/16 17:47:54 matt Exp $ */
/* adapted from: */
-/* $NetBSD: obio_ohci.c,v 1.8 2012/10/27 17:17:40 chs Exp $ */
+/* $NetBSD: obio_ohci.c,v 1.9 2013/06/16 17:47:54 matt Exp $ */
/* $OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
/*
@@ -24,7 +24,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.8 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.9 2013/06/16 17:47:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,12 +85,12 @@ obioohci_match(device_t parent, cfdata_t
if (obio->obio_addr != OHCI1_BASE_2430)
return 0;
#endif
-#if defined(OMAP_3530)
- if (obio->obio_addr != OHCI1_BASE_3530)
+#if defined(OMAP3) && !defined(OMAP4)
+ if (obio->obio_addr != OHCI1_BASE_OMAP3)
return 0;
#endif
-#if defined(OMAP_4430)
- if (obio->obio_addr != OHCI1_BASE_4430)
+#if defined(OMAP4)
+ if (obio->obio_addr != OHCI1_BASE_OMAP4)
return 0;
#endif
Index: src/sys/arch/arm/omap/omap2_mputmr.c
diff -u src/sys/arch/arm/omap/omap2_mputmr.c:1.6 src/sys/arch/arm/omap/omap2_mputmr.c:1.7
--- src/sys/arch/arm/omap/omap2_mputmr.c:1.6 Sat Jun 15 21:58:20 2013
+++ src/sys/arch/arm/omap/omap2_mputmr.c Sun Jun 16 17:47:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_mputmr.c,v 1.6 2013/06/15 21:58:20 matt Exp $ */
+/* $NetBSD: omap2_mputmr.c,v 1.7 2013/06/16 17:47:54 matt Exp $ */
/*
* OMAP 2430 GP timers
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_mputmr.c,v 1.6 2013/06/15 21:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_mputmr.c,v 1.7 2013/06/16 17:47:54 matt Exp $");
#include "opt_omap.h"
#include "opt_cpuoptions.h"
@@ -89,12 +89,12 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_mputmr
#include <sys/time.h>
#include <sys/timetc.h>
#include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/clock_subr.h>
-#include <sys/bus.h>
-#include <machine/intr.h>
-
+#include <arm/omap/omap_var.h>
#include <arm/omap/omap_gptmrreg.h>
#include <arm/omap/omap2_mputmrvar.h>
