Date: Sun, 15 Apr 2012 01:40:22 +0000 (UTC) From: Damjan Marion <dmarion@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r234305 - in projects/armv6/sys/arm/ti: . usb Message-ID: <201204150140.q3F1eMmc058940@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dmarion Date: Sun Apr 15 01:40:22 2012 New Revision: 234305 URL: http://svn.freebsd.org/changeset/base/234305 Log: TI code cleanup. Deleted: projects/armv6/sys/arm/ti/omap.c Modified: projects/armv6/sys/arm/ti/tivar.h projects/armv6/sys/arm/ti/usb/omap_ehci.c Modified: projects/armv6/sys/arm/ti/tivar.h ============================================================================== --- projects/armv6/sys/arm/ti/tivar.h Sun Apr 15 00:04:23 2012 (r234304) +++ projects/armv6/sys/arm/ti/tivar.h Sun Apr 15 01:40:22 2012 (r234305) @@ -33,124 +33,7 @@ #ifndef _TIVAR_H_ #define _TIVAR_H_ -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/module.h> -#include <sys/time.h> -#include <sys/bus.h> -#include <sys/resource.h> -#include <sys/rman.h> -#include <sys/sysctl.h> -#include <sys/endian.h> - -#include <machine/bus.h> -#include <machine/cpu.h> -#include <machine/cpufunc.h> -#include <machine/resource.h> -#include <machine/intr.h> - -#include <arm/ti/ti_cpuid.h> - - -/* - * Random collection of functions and definitions ... needs cleanup - * - * - * - */ - - -extern struct bus_space omap_bs_tag; /* board-dependent reset function implementation */ extern void (*ti_cpu_reset)(void); -unsigned int -omap_sdram_size(void); - -void -omap_mask_all_intr(void); - -void -omap_post_filter_intr(void *arg); - -int -omap_setup_intr(device_t dev, device_t child, - struct resource *res, int flags, driver_filter_t *filt, - driver_intr_t *intr, void *arg, void **cookiep); - -int -omap_teardown_intr(device_t dev, device_t child, struct resource *res, - void *cookie); - - - -/** - * OMAP Device IDs - * - * These values are typically read out of the ID_CODE register, located at - * physical address 0x4A00 2204 on most OMAP devices - */ -#define OMAP_CPUID_OMAP3530 0x0C00 -#define OMAP_CPUID_OMAP3525 0x4C00 -#define OMAP_CPUID_OMAP3515 0x1C00 -#define OMAP_CPUID_OMAP3503 0x5C00 - -#define OMAP_CPUID_OMAP4430_ES1_2 0xB852 -#define OMAP_CPUID_OMAP4430 0xB95C - -/** - * struct omap_softc - * - * - * - */ -extern uint32_t omap3_chip_id; - -static inline int -omap_cpu_is(uint32_t cpu) -{ - return ((omap3_chip_id & 0xffff) == cpu); -} - -/** - * struct omap_softc - * - * - * - */ -struct omap_softc { - device_t sc_dev; - bus_space_tag_t sc_iotag; - bus_space_handle_t sc_ioh; - - struct rman sc_irq_rman; - struct rman sc_mem_rman; - bus_dma_tag_t sc_dmat; -}; - -struct omap_mem_range { - bus_addr_t base; - bus_size_t size; -}; - -/** - * struct omap_cpu_dev - * - * Structure used to define all the SoC devices, it allows for two memory - * address ranges and 4 IRQ's per device. - * - */ -struct omap_cpu_dev { - const char *name; - int unit; - - struct omap_mem_range mem[16]; - int irqs[16]; -}; - -struct omap_ivar { - struct resource_list resources; -}; - -#endif /* _OMAP3VAR_H_ */ +#endif /* _TIVAR_H_ */ Modified: projects/armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- projects/armv6/sys/arm/ti/usb/omap_ehci.c Sun Apr 15 00:04:23 2012 (r234304) +++ projects/armv6/sys/arm/ti/usb/omap_ehci.c Sun Apr 15 01:40:22 2012 (r234305) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/kernel.h> #include <sys/bus.h> +#include <sys/rman.h> #include <sys/linker_set.h> #include <sys/module.h> #include <sys/lock.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204150140.q3F1eMmc058940>