Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcarm move sa11x0 to under arch/arm
details: https://anonhg.NetBSD.org/src/rev/d440855690f9
branches: trunk
changeset: 534187:d440855690f9
user: ichiro <ichiro%NetBSD.org@localhost>
date: Fri Jul 19 19:15:48 2002 +0000
description:
move sa11x0 to under arch/arm
make compile
diffstat:
sys/arch/hpcarm/conf/files.hpcarm | 53 +-
sys/arch/hpcarm/dev/j720ssp.c | 11 +-
sys/arch/hpcarm/hpcarm/hpc_machdep.c | 5 +-
sys/arch/hpcarm/sa11x0/sa1111.c | 365 ------
sys/arch/hpcarm/sa11x0/sa1111_reg.h | 76 -
sys/arch/hpcarm/sa11x0/sa1111_var.h | 71 -
sys/arch/hpcarm/sa11x0/sa11x0.c | 219 ---
sys/arch/hpcarm/sa11x0/sa11x0_com.c | 1681 ----------------------------
sys/arch/hpcarm/sa11x0/sa11x0_comreg.h | 97 -
sys/arch/hpcarm/sa11x0/sa11x0_comvar.h | 97 -
sys/arch/hpcarm/sa11x0/sa11x0_dmacreg.h | 95 -
sys/arch/hpcarm/sa11x0/sa11x0_gpioreg.h | 98 -
sys/arch/hpcarm/sa11x0/sa11x0_io.c | 245 ----
sys/arch/hpcarm/sa11x0/sa11x0_io_asm.S | 288 ----
sys/arch/hpcarm/sa11x0/sa11x0_irq.S | 344 -----
sys/arch/hpcarm/sa11x0/sa11x0_irqhandler.c | 296 ----
sys/arch/hpcarm/sa11x0/sa11x0_mcpreg.h | 84 -
sys/arch/hpcarm/sa11x0/sa11x0_ost.c | 348 -----
sys/arch/hpcarm/sa11x0/sa11x0_ostreg.h | 80 -
sys/arch/hpcarm/sa11x0/sa11x0_ppcreg.h | 65 -
sys/arch/hpcarm/sa11x0/sa11x0_reg.h | 72 -
sys/arch/hpcarm/sa11x0/sa11x0_sspreg.h | 76 -
sys/arch/hpcarm/sa11x0/sa11x0_var.h | 72 -
sys/arch/hpcarm/sa11x0/sa11x1_pcic.c | 352 -----
sys/arch/hpcarm/sa11x0/sa11x1_pcicreg.h | 80 -
sys/arch/hpcarm/sa11x0/sa11xx_pcic.c | 471 -------
sys/arch/hpcarm/sa11x0/sa11xx_pcicreg.h | 44 -
sys/arch/hpcarm/sa11x0/sa11xx_pcicvar.h | 94 -
28 files changed, 12 insertions(+), 5867 deletions(-)
diffs (truncated from 6039 to 300 lines):
diff -r 907f65236078 -r d440855690f9 sys/arch/hpcarm/conf/files.hpcarm
--- a/sys/arch/hpcarm/conf/files.hpcarm Fri Jul 19 19:07:33 2002 +0000
+++ b/sys/arch/hpcarm/conf/files.hpcarm Fri Jul 19 19:15:48 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcarm,v 1.43 2002/07/19 08:49:49 toshii Exp $
+# $NetBSD: files.hpcarm,v 1.44 2002/07/19 19:15:48 ichiro Exp $
#
# First try for arm-specific configuration info
#
@@ -34,31 +34,8 @@
# HPCARM specific files
file arch/hpcarm/hpcarm/hpc_machdep.c
-# SA11[01]0 integrated peripherals
-# parent to sacom, gpio, fb, saost, XXX
-# also provides irq and timer services
-device saip { [addr=-1], [size=0], [membase=-1], [memsize=0], [intr=-1] }
-attach saip at mainbus
-file arch/hpcarm/sa11x0/sa11x0.c saip needs-flag
-file arch/hpcarm/sa11x0/sa11x0_io.c saip
-file arch/hpcarm/sa11x0/sa11x0_io_asm.S saip
-file arch/hpcarm/sa11x0/sa11x0_irq.S saip
-file arch/hpcarm/sa11x0/sa11x0_irqhandler.c saip
-
-# clock device
-device saost
-attach saost at saip
-file arch/hpcarm/sa11x0/sa11x0_ost.c saost needs-flag
-
-device sacom: tty
-attach sacom at saip
-file arch/hpcarm/sa11x0/sa11x0_com.c sacom needs-flag
-
-
-# SA11[01]0 companion chips
-device sacc { [addr=-1], [size=0], [membase=-1], [memsize=0], [intr=-1] }
-attach sacc at saip
-file arch/hpcarm/sa11x0/sa1111.c sacc
+# Include hpcarm/StrongARM config definitions.
+include "arch/arm/conf/files.sa11x0"
# iPAQ Virtual bus
device ipaqbus {}
@@ -84,11 +61,6 @@
attach sed at saip
file arch/hpcarm/dev/sed_saip.c sed
-#
-# Workstation Console
-#
-include "dev/wscons/files.wscons"
-
device j720ssp: wskbddev, wsmousedev, tpcalib
attach j720ssp at saip
file arch/hpcarm/dev/j720ssp.c j720ssp
@@ -96,22 +68,6 @@
file dev/cninit.c
-# XXX this is a hack to use dev/pcmcia without fdc.c
-device fdc
-
-# PCMCIA
-include "dev/pcmcia/files.pcmcia"
-
-device sacpcic: pcmciabus
-attach sacpcic at sacc
-file arch/hpcarm/sa11x0/sa11x1_pcic.c sacpcic needs-flag
-
-device ipaqpcic: pcmciabus
-attach ipaqpcic at ipaqbus
-file arch/hpcarm/dev/ipaq_pcic.c ipaqpcic needs-flag
-
-file arch/hpcarm/sa11x0/sa11xx_pcic.c sacpcic | ipaqpcic
-
# Atmel microcontroller
device atmelgpioif {}
device atmelgpio: atmelgpioif
@@ -141,6 +97,3 @@
# Include PCI stuff
include "dev/pci/files.pci"
-
-# Include USB stuff
-include "dev/usb/files.usb"
diff -r 907f65236078 -r d440855690f9 sys/arch/hpcarm/dev/j720ssp.c
--- a/sys/arch/hpcarm/dev/j720ssp.c Fri Jul 19 19:07:33 2002 +0000
+++ b/sys/arch/hpcarm/dev/j720ssp.c Fri Jul 19 19:15:48 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: j720ssp.c,v 1.6 2002/07/19 08:49:49 toshii Exp $ */
+/* $NetBSD: j720ssp.c,v 1.7 2002/07/19 19:15:49 ichiro Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -87,10 +87,11 @@
#include <machine/bootinfo.h>
#include <hpcarm/dev/sed1356var.h>
-#include <hpcarm/sa11x0/sa11x0_var.h>
-#include <hpcarm/sa11x0/sa11x0_gpioreg.h>
-#include <hpcarm/sa11x0/sa11x0_ppcreg.h>
-#include <hpcarm/sa11x0/sa11x0_sspreg.h>
+
+#include <arm/sa11x0/sa11x0_var.h>
+#include <arm/sa11x0/sa11x0_gpioreg.h>
+#include <arm/sa11x0/sa11x0_ppcreg.h>
+#include <arm/sa11x0/sa11x0_sspreg.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
diff -r 907f65236078 -r d440855690f9 sys/arch/hpcarm/hpcarm/hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c Fri Jul 19 19:07:33 2002 +0000
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c Fri Jul 19 19:15:48 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc_machdep.c,v 1.48 2002/07/13 13:40:28 toshii Exp $ */
+/* $NetBSD: hpc_machdep.c,v 1.49 2002/07/19 19:15:50 ichiro Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -87,7 +87,8 @@
#include <arm/undefined.h>
#include <machine/rtc.h>
#include <machine/platid.h>
-#include <hpcarm/sa11x0/sa11x0_reg.h>
+
+#include <arm/sa11x0/sa11x0_reg.h>
#include <dev/hpc/bicons.h>
diff -r 907f65236078 -r d440855690f9 sys/arch/hpcarm/sa11x0/sa1111.c
--- a/sys/arch/hpcarm/sa11x0/sa1111.c Fri Jul 19 19:07:33 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,365 +0,0 @@
-/* $NetBSD: sa1111.c,v 1.10 2001/09/24 14:29:31 takemura Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by IWAMOTO Toshihiro.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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.
- */
-
-/*
- * TODO:
- * - separate machine specific attach code
- * - introduce bus abstraction to support SA1101
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/types.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/uio.h>
-
-#include <machine/bus.h>
-#include <machine/platid.h>
-#include <machine/platid_mask.h>
-
-#include <hpcarm/sa11x0/sa11x0_reg.h>
-#include <hpcarm/sa11x0/sa11x0_var.h>
-#include <hpcarm/sa11x0/sa11x0_gpioreg.h>
-#include <hpcarm/sa11x0/sa1111_reg.h>
-#include <hpcarm/sa11x0/sa1111_var.h>
-
-static int sacc_probe(struct device *, struct cfdata *, void *);
-static void sacc_attach(struct device *, struct device *, void *);
-static int sa1111_search(struct device *, struct cfdata *, void *);
-static int sa1111_print(void *, const char *);
-
-static void sacc_intr_calculatemasks(struct sacc_softc *);
-static void sacc_intr_setpolarity(sacc_chipset_tag_t *, int , int);
-int sacc_intr(void *);
-
-struct platid_data sacc_platid_table[] = {
- { &platid_mask_MACH_HP_JORNADA_720, (void *)1 },
- { &platid_mask_MACH_HP_JORNADA_720JP, (void *)1 },
- { NULL, NULL }
-};
-
-struct cfattach sacc_ca = {
- sizeof(struct sacc_softc), sacc_probe, sacc_attach
-};
-
-#ifdef INTR_DEBUG
-#define DPRINTF(arg) printf arg
-#else
-#define DPRINTF(arg)
-#endif
-
-static int
-sacc_probe(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
-{
- struct sa11x0_attach_args *sa = aux;
- bus_space_handle_t ioh;
- u_int32_t skid;
-
- if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size, 0, &ioh))
- return (0);
-
- skid = bus_space_read_4(sa->sa_iot, ioh, SACCSBI_SKID);
- bus_space_unmap(sa->sa_iot, ioh, sa->sa_size);
-
- if ((skid & 0xffffff00) != 0x690cc200)
- return (0);
-
- return (1);
-}
-
-static void
-sacc_attach(parent, self, aux)
- struct device *parent;
- struct device *self;
- void *aux;
-{
- int i, gpiopin;
- u_int32_t skid;
- struct sacc_softc *sc = (struct sacc_softc *)self;
- struct sa11x0_softc *psc = (struct sa11x0_softc *)parent;
- struct sa11x0_attach_args *sa = aux;
- struct platid_data *p;
-
- printf("\n");
-
- sc->sc_iot = sa->sa_iot;
- sc->sc_piot = psc->sc_iot;
- sc->sc_gpioh = psc->sc_gpioh;
- if ((p = platid_search_data(&platid, sacc_platid_table)) == NULL)
- return;
-
- gpiopin = (int)p->data;
- sc->sc_gpiomask = 1 << gpiopin;
-
- if (bus_space_map(sa->sa_iot, sa->sa_addr, sa->sa_size, 0,
- &sc->sc_ioh)) {
- printf("%s: unable to map registers\n", sc->sc_dev.dv_xname);
- return;
- }
-
- skid = bus_space_read_4(sc->sc_iot, sc->sc_ioh, SACCSBI_SKID);
-
- printf("%s: SA1111 rev %d.%d\n", sc->sc_dev.dv_xname,
- (skid & 0xf0) >> 3, skid & 0xf);
-
- for(i = 0; i < SACCIC_LEN; i++)
- sc->sc_intrhand[i] = NULL;
-
- /* initialize SA1111 interrupt controller */
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, SACCIC_INTEN0, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, SACCIC_INTEN1, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, SACCIC_INTTSTSEL, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_ioh,
- SACCIC_INTSTATCLR0, 0xffffffff);
- bus_space_write_4(sc->sc_iot, sc->sc_ioh,
- SACCIC_INTSTATCLR1, 0xffffffff);
-
- /* connect to SA1110's GPIO intr */
- sa11x0_intr_establish(0, gpiopin, 1, IPL_SERIAL, sacc_intr, sc);
-
- /*
- * Attach each devices
- */
- config_search(sa1111_search, self, NULL);
-}
-
-static int
Home |
Main Index |
Thread Index |
Old Index