Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#include <arm/omap/omap_var.h> where appropriate

Browse Source 
Remove unneeded frequency check
This commit is contained in:
matt 2013-06-16 17:47:54 +00:00
parent 74ddb6be51
commit 53b726f4dc
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/arm/omap/obio_mputmr.c
View File

@ -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;

14
sys/arch/arm/omap/obio_ohci.c
View File

@ -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

10
sys/arch/arm/omap/omap2_mputmr.c
View File

@ -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>

5
sys/arch/arm/omap/omap3_ehci.c
View File

@ -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>