diff options
author | ian <ian@FreeBSD.org> | 2015-08-23 17:54:48 +0000 |
---|---|---|
committer | ian <ian@FreeBSD.org> | 2015-08-23 17:54:48 +0000 |
commit | 9fbd70f0796a6feeb989a8f1443fefd3d29409c0 (patch) | |
tree | f056664ab16487ca87f0f7ba7f75130314ff2c98 /sys/arm | |
parent | f1738f73c5c88085ceaa97f5fad5bf8510f0db50 (diff) | |
download | FreeBSD-src-9fbd70f0796a6feeb989a8f1443fefd3d29409c0.zip FreeBSD-src-9fbd70f0796a6feeb989a8f1443fefd3d29409c0.tar.gz |
Always compile in PPS capture. Use the same device name used in 11-current.
This is a direct commit to 10-stable because the corresponding changes in 11
are bound up with all the device-tree rework for beaglebone. This somewhat
aligns the features between the two branches, from a user's perspective.
Diffstat (limited to 'sys/arm')
-rw-r--r-- | sys/arm/ti/am335x/am335x_dmtimer.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c index 09acb3d..3153a10 100644 --- a/sys/arm/ti/am335x/am335x_dmtimer.c +++ b/sys/arm/ti/am335x/am335x_dmtimer.c @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/intr.h> -#include "opt_ntp.h" - #include <dev/fdt/fdt_common.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_bus.h> @@ -198,7 +196,6 @@ am335x_dmtimer_et_write_4(struct am335x_dmtimer_softc *sc, uint32_t reg, * latched value from the timer. The remaining work (done by pps_event()) is * scheduled to be done later in a non-interrupt context. */ -#ifdef PPS_SYNC #define PPS_CDEV_NAME "dmtpps" @@ -405,7 +402,7 @@ am335x_dmtimer_pps_init(device_t dev, struct am335x_dmtimer_softc *sc) /* Create the PPS cdev. */ unit = device_get_unit(dev); sc->pps_cdev = make_dev(&am335x_dmtimer_pps_cdevsw, unit, - UID_ROOT, GID_WHEEL, 0600, PPS_CDEV_NAME "%d", unit); + UID_ROOT, GID_WHEEL, 0600, PPS_CDEV_NAME); sc->pps_cdev->si_drv1 = sc; device_printf(dev, "Using DMTimer%d for PPS device /dev/%s%d\n", @@ -414,20 +411,6 @@ am335x_dmtimer_pps_init(device_t dev, struct am335x_dmtimer_softc *sc) return (timer_num); } -#else /* PPS_SYNC */ - -static int -am335x_dmtimer_pps_init(device_t dev, struct am335x_dmtimer_softc *sc) -{ - - /* - * When PPS support is not compiled in, there's no need to use a timer - * that has an associated capture-input pin, so use the default. - */ - return (DEFAULT_TC_TIMER); -} - -#endif /* PPS_SYNC */ /* * End of PPS driver code. */ |