Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Remove Designware timer code. This was used by the old R...



details:   https://anonhg.NetBSD.org/src/rev/fcf2e6bb519e
branches:  trunk
changeset: 998671:fcf2e6bb519e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Apr 26 10:11:03 2019 +0000

description:
Remove Designware timer code. This was used by the old Rockchip port and
is no longer required.

diffstat:

 sys/conf/files           |   6 +---
 sys/dev/ic/dwc_tmr.c     |  75 ------------------------------------------------
 sys/dev/ic/dwc_tmr_reg.h |  41 --------------------------
 sys/dev/ic/dwc_tmr_var.h |  45 ----------------------------
 4 files changed, 1 insertions(+), 166 deletions(-)

diffs (193 lines):

diff -r edd3abb4342a -r fcf2e6bb519e sys/conf/files
--- a/sys/conf/files    Fri Apr 26 09:03:46 2019 +0000
+++ b/sys/conf/files    Fri Apr 26 10:11:03 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1234 2019/04/13 08:41:36 maxv Exp $
+#      $NetBSD: files,v 1.1235 2019/04/26 10:11:03 jmcneill Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -1149,10 +1149,6 @@
 device         hpet
 file   dev/ic/hpet.c           hpet                    needs-flag
 
-# DesignWare timer
-device dwctmr
-file   dev/ic/dwc_tmr.c        dwctmr
-
 # SMSC LAN9118 Family Ethernet Controller
 #
 device smsh: arp, ether, ifnet, mii
diff -r edd3abb4342a -r fcf2e6bb519e sys/dev/ic/dwc_tmr.c
--- a/sys/dev/ic/dwc_tmr.c      Fri Apr 26 09:03:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/* $NetBSD: dwc_tmr.c,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_tmr.c,v 1.1 2015/01/17 15:04:47 jmcneill Exp $");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/device.h>
-#include <sys/intr.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/timetc.h>
-
-#include <dev/ic/dwc_tmr_reg.h>
-#include <dev/ic/dwc_tmr_var.h>
-
-#define TIMER_READ(sc, reg) \
-    bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
-#define TIMER_WRITE(sc, reg, val) \
-    bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
-
-static u_int   dwc_tmr_get_timecount(struct timecounter *);
-
-void
-dwc_tmr_attach_subr(struct dwc_tmr_softc *sc, u_int64_t freq)
-{
-
-       TIMER_WRITE(sc, DWC_TMR_CONTROL_REG, 0);
-       TIMER_WRITE(sc, DWC_TMR_LOAD_COUNT_REG, ~0);
-       TIMER_WRITE(sc, DWC_TMR_CONTROL_REG, DWC_TMR_CONTROL_ENABLE);
-
-       sc->sc_tc.tc_get_timecount = dwc_tmr_get_timecount;
-       sc->sc_tc.tc_poll_pps = NULL;
-       sc->sc_tc.tc_counter_mask = ~0;
-       sc->sc_tc.tc_frequency = freq;
-       sc->sc_tc.tc_name = device_xname(sc->sc_dev);
-       sc->sc_tc.tc_priv = sc;
-       sc->sc_tc.tc_quality = 900;
-
-       tc_init(&sc->sc_tc);
-}
-
-static u_int
-dwc_tmr_get_timecount(struct timecounter *tc)
-{
-       struct dwc_tmr_softc *sc = tc->tc_priv;
-
-       return ~TIMER_READ(sc, DWC_TMR_CURRENT_VALUE_REG);
-}
diff -r edd3abb4342a -r fcf2e6bb519e sys/dev/ic/dwc_tmr_reg.h
--- a/sys/dev/ic/dwc_tmr_reg.h  Fri Apr 26 09:03:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/* $NetBSD: dwc_tmr_reg.h,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _DWC_TMR_REG_H
-#define _DWC_TMR_REG_H
-
-#define DWC_TMR_LOAD_COUNT_REG         0x0000
-#define DWC_TMR_CURRENT_VALUE_REG      0x0004
-#define DWC_TMR_CONTROL_REG            0x0008
-#define DWC_TMR_INTSTATUS_REG          0x0010
-
-#define DWC_TMR_CONTROL_INTERRUPT_MASK __BIT(2)
-#define DWC_TMR_CONTROL_MODE           __BIT(1)
-#define DWC_TMR_CONTROL_ENABLE         __BIT(0)
-
-#endif /* !_DWC_TMR_REG_H */
diff -r edd3abb4342a -r fcf2e6bb519e sys/dev/ic/dwc_tmr_var.h
--- a/sys/dev/ic/dwc_tmr_var.h  Fri Apr 26 09:03:46 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* $NetBSD: dwc_tmr_var.h,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _DWC_TMR_VAR_H
-#define _DWC_TMR_VAR_H
-
-#include <sys/bus.h>
-#include <sys/device.h>
-#include <sys/timetc.h>
-
-struct dwc_tmr_softc {
-       device_t sc_dev;
-       bus_space_tag_t sc_bst;
-       bus_space_handle_t sc_bsh;
-       struct timecounter sc_tc;
-};
-
-void   dwc_tmr_attach_subr(struct dwc_tmr_softc *, u_int64_t);
-
-#endif /* !_DWC_TMR_VAR_H */



Home | Main Index | Thread Index | Old Index