From 53b726f4dc7a5f89bb9a20cac0b33c60f3d16ff4 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sun, 16 Jun 2013 17:47:54 +0000
Subject: [PATCH] #include <arm/omap/omap_var.h> where appropriate Remove
 unneeded frequency check

---
 sys/arch/arm/omap/obio_mputmr.c  |  8 ++------
 sys/arch/arm/omap/obio_ohci.c    | 14 +++++++-------
 sys/arch/arm/omap/omap2_mputmr.c | 10 +++++-----
 sys/arch/arm/omap/omap3_ehci.c   |  5 +++--
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/sys/arch/arm/omap/obio_mputmr.c b/sys/arch/arm/omap/obio_mputmr.c
index 88fbe303363d..2abe749a689b 100644
--- a/sys/arch/arm/omap/obio_mputmr.c
+++ b/sys/arch/arm/omap/obio_mputmr.c
@@ -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.c,v 1.7 2013/01/16 03:30:48 jmcneill Exp
 
 #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;
diff --git a/sys/arch/arm/omap/obio_ohci.c b/sys/arch/arm/omap/obio_ohci.c
index e22d5edd3550..9034231bdc48 100644
--- a/sys/arch/arm/omap/obio_ohci.c
+++ b/sys/arch/arm/omap/obio_ohci.c
@@ -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 cf, void *aux)
 	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
 
diff --git a/sys/arch/arm/omap/omap2_mputmr.c b/sys/arch/arm/omap/omap2_mputmr.c
index 13e7b400e8cb..e493d41f7d1c 100644
--- a/sys/arch/arm/omap/omap2_mputmr.c
+++ b/sys/arch/arm/omap/omap2_mputmr.c
@@ -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.c,v 1.6 2013/06/15 21:58:20 matt Exp $"
 #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>
 
diff --git a/sys/arch/arm/omap/omap3_ehci.c b/sys/arch/arm/omap/omap3_ehci.c
index 1109c70c0d58..61d1569e5317 100644
--- a/sys/arch/arm/omap/omap3_ehci.c
+++ b/sys/arch/arm/omap/omap3_ehci.c
@@ -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 <jmcneill@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,v 1.7 2013/06/16 16:42:13 matt Exp $");
 #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>