Date: Thu, 21 Jun 2012 12:24:15 +0000 From: aleek@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r238078 - in soc2012/aleek/beaglexm-armv6/sys: arm/ti/am37x boot/fdt/dts Message-ID: <20120621122415.DBA8810656DF@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: aleek Date: Thu Jun 21 12:24:14 2012 New Revision: 238078 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238078 Log: added event timer Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer.h soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer.h ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer.h Thu Jun 21 11:39:56 2012 (r238077) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/am37x_gptimer.h Thu Jun 21 12:24:14 2012 (r238078) @@ -114,9 +114,6 @@ void omap3_gptimer_intr_filter_ack(struct omap3_gptimer_softc *sc); -static unsigned -omap3_gptimer_tc_get_timecount(struct timecounter *tc); - static inline uint32_t omap3_gptimer_readl(struct omap3_gptimer_softc *sc, bus_size_t off); @@ -137,18 +134,15 @@ int omap3_gptimer_get_freq(struct omap3_gptimer_softc *sc, uint32_t *freq); -static int -omap3_calibrate_delay_loop(struct timecounter *tc); - int omap3_gptimer_set_intr_filter(struct omap3_gptimer_softc *sc, driver_filter_t filter); static void omap3_gptimer_intr(void *arg); -#if 0 + static int omap3_timer_tick_intr(void *arg); -#endif + static int omap3_gptimer_probe(device_t dev); @@ -161,3 +155,6 @@ int omap3_gptimer_read_count(struct omap3_gptimer_softc *sc, uint32_t *cnt); +static unsigned +omap3_gptimer_tc_get_timecount(struct timecounter *tc); + Modified: soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x Thu Jun 21 11:39:56 2012 (r238077) +++ soc2012/aleek/beaglexm-armv6/sys/arm/ti/am37x/files.am37x Thu Jun 21 12:24:14 2012 (r238078) @@ -3,6 +3,7 @@ arm/ti/aintc.c standard arm/ti/am37x/am37x_prcm.c standard arm/ti/am37x/am37x_gptimer_tc.c standard +#arm/ti/am37x/am37x_gptimer_et.c standard arm/ti/am37x/am37x_scm_padconf.c standard arm/ti/ti_edma3.c standard arm/ti/ti_mmchs.c optional mmc Modified: soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts ============================================================================== --- soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Thu Jun 21 11:39:56 2012 (r238077) +++ soc2012/aleek/beaglexm-armv6/sys/boot/fdt/dts/beagleboardxm.dts Thu Jun 21 12:24:14 2012 (r238078) @@ -110,8 +110,8 @@ interrupt-parent = <&AINTC>; }; */ - gptimer_tc@48086000 { - compatible = "ti,omap3_gptimer_tc"; + gptimer_et@48086000 { + compatible = "ti,omap3_gptimer_et"; #address-cells = <1>; #size-cells = <1>; reg = < 0x48086000 0x1000 >; @@ -119,6 +119,15 @@ interrupt-parent = <&AINTC>; }; + gptimer_tc@48088000 { + compatible = "ti,omap3_gptimer_tc"; + #address-cells = <1>; + #size-cells = <1>; + reg = < 0x48088000 0x1000 >; + interrupts = < 47 >; + interrupt-parent = <&AINTC>; + }; + uart0: serial@49020000 { compatible = "ns16550"; reg = <0x49020000 0x1000>;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120621122415.DBA8810656DF>