Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Fix up incorrect ICU reporting, add processor speci...
details: https://anonhg.NetBSD.org/src/rev/dccbc571317c
branches: trunk
changeset: 588069:dccbc571317c
user: gdamore <gdamore%NetBSD.org@localhost>
date: Mon Feb 06 23:23:53 2006 +0000
description:
Fix up incorrect ICU reporting, add processor specific switch tables for
IRQ routing and such.
Closes PR port-evbmips/31992.
Reviewed by simonb@, matt@, and izumi@
diffstat:
sys/arch/evbmips/conf/ALCHEMY | 10 +-
sys/arch/mips/alchemy/au1000.c | 213 +++++++++++++++++++++++++++++++++
sys/arch/mips/alchemy/au1100.c | 214 ++++++++++++++++++++++++++++++++++
sys/arch/mips/alchemy/au1500.c | 210 +++++++++++++++++++++++++++++++++
sys/arch/mips/alchemy/au1550.c | 214 ++++++++++++++++++++++++++++++++++
sys/arch/mips/alchemy/au_icu.c | 174 +++++++++++---------------
sys/arch/mips/alchemy/aubus.c | 154 ++++++------------------
sys/arch/mips/alchemy/include/auvar.h | 63 +++++++++-
sys/arch/mips/conf/files.alchemy | 12 +-
9 files changed, 1045 insertions(+), 219 deletions(-)
diffs (truncated from 1452 to 300 lines):
diff -r 5ceae3193888 -r dccbc571317c sys/arch/evbmips/conf/ALCHEMY
--- a/sys/arch/evbmips/conf/ALCHEMY Mon Feb 06 20:14:36 2006 +0000
+++ b/sys/arch/evbmips/conf/ALCHEMY Mon Feb 06 23:23:53 2006 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: ALCHEMY,v 1.1 2006/02/06 03:43:46 gdamore Exp $
+# $NetBSD: ALCHEMY,v 1.2 2006/02/06 23:23:53 gdamore Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.pb1000"
-#ident "ALCHEMY-$Revision: 1.1 $"
+#ident "ALCHEMY-$Revision: 1.2 $"
maxusers 32
@@ -15,6 +15,12 @@
#options CONSPEED=115200 # YAMON default
options HZ=512 # for profiling
+# CPU support
+options ALCHEMY_AU1000
+options ALCHEMY_AU1100
+options ALCHEMY_AU1500
+options ALCHEMY_AU1550
+
#options LOCKDEBUG
options SOSEND_LOAN
options SOSEND_COUNTERS
diff -r 5ceae3193888 -r dccbc571317c sys/arch/mips/alchemy/au1000.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mips/alchemy/au1000.c Mon Feb 06 23:23:53 2006 +0000
@@ -0,0 +1,213 @@
+/* $NetBSD: au1000.c,v 1.1 2006/02/06 23:23:53 gdamore Exp $ */
+
+/*-
+ * Copyright (c) 2006 Itronix Inc.
+ * All rights reserved.
+ *
+ * Written by Garrett D'Amore for Itronix Inc.
+ *
+ * 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. The name of Itronix Inc. may not be used to endorse
+ * or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``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 ITRONIX INC. 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.
+ */
+
+/*
+ * Copyright 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Simon Burge for Wasabi Systems, Inc.
+ *
+ * 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 for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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.
+ */
+
+/*
+ * Copyright (c) 1996 Christopher G. Demetriou. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * 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");
+
+#include <sys/param.h>
+#include <machine/bus.h>
+#include <machine/locore.h>
+#include <mips/alchemy/include/aureg.h>
+#include <mips/alchemy/include/auvar.h>
+
+static const char *au1000_irqnames[] = {
+ "uart0",
+ "uart1",
+ "uart2",
+ "uart3",
+ "ssi0",
+ "ssi1",
+ "dma0",
+ "dma1",
+ "dma2",
+ "dma3",
+ "dma4",
+ "dma5",
+ "dma6",
+ "dma7",
+ "toy tick",
+ "toy match0",
+ "toy match1",
+ "toy match2",
+ "rtc tick",
+ "rtc match0",
+ "rtc match1",
+ "rtc match2",
+ "irda tx",
+ "irda rx",
+ "usb intr",
+ "usb suspend",
+ "usb host",
+ "ac97",
+ "mac0",
+ "mac1",
+ "i2s",
+ "ac97 cmd",
+ "gpio 0",
+ "gpio 1",
+ "gpio 2",
+ "gpio 3",
+ "gpio 4",
+ "gpio 5",
+ "gpio 6",
+ "gpio 7",
+ "gpio 8",
+ "gpio 9",
+ "gpio 10",
+ "gpio 11",
+ "gpio 12",
+ "gpio 13",
+ "gpio 14",
+ "gpio 15",
+ "gpio 16",
+ "gpio 17",
+ "gpio 18",
+ "gpio 19",
+ "gpio 20",
+ "gpio 21",
+ "gpio 22",
+ "gpio 23",
+ "gpio 24",
+ "gpio 25",
+ "gpio 26",
+ "gpio 27",
+ "gpio 28",
+ "gpio 29",
+ "gpio 30",
+ "gpio 31"
+};
+
+static struct au_dev au1000_devices[] = {
+ { "aucom", { UART0_BASE }, { 0, -1 }},
+ { "aucom", { UART1_BASE }, { 1, -1 }},
+ { "aucom", { UART2_BASE }, { 2, -1 }},
+ { "aucom", { UART3_BASE }, { 3, -1 }},
+ { "aurtc", { }, { -1, -1 }},
+ { "aumac", { MAC0_BASE, MAC0_ENABLE, MAC0_DMA_BASE }, { 28, -1 }},
+ { "aumac", { MAC1_BASE, MAC1_ENABLE, MAC1_DMA_BASE }, { 29, -1 }},
+ { "ohci", { USBH_BASE, USBH_ENABLE, USBH_SIZE }, { 26, -1 }},
+#if 0
+ { "auaudio", { AC97_BASE }, { 27, 31 }},
+ { "i2s", { I2S_BASE }, { 30, -1 }},
+ { "ssi", { SSI0_BASE }, { 4, -1 }},
+ { "ssi", { SSI1_BASE }, { 5, -1 }},
+ { "usbd", { USBD_BASE }, { 24, 25 }},
+ { "irda", { IRDA_BASE }, { 22, 23 }},
+ { "gpio", { SYS_BASE }, { -1, -1 }},
+ /* XXX: lcd? */
+#endif
+ { NULL }
+};
+
+static struct au_chipdep au1000_chipdep = {
+ "au1000",
+ { IC0_BASE, IC1_BASE }, /* ICUs */
+ au1000_devices,
+ au1000_irqnames,
+};
+
+boolean_t
+au1000_match(struct au_chipdep **cpp)
+{
+
+ if (MIPS_PRID_COPTS(cpu_id) == MIPS_AU1000) {
+ *cpp = &au1000_chipdep;
+ return TRUE;
+ }
+ return FALSE;
+}
diff -r 5ceae3193888 -r dccbc571317c sys/arch/mips/alchemy/au1100.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mips/alchemy/au1100.c Mon Feb 06 23:23:53 2006 +0000
@@ -0,0 +1,214 @@
+/* $NetBSD: au1100.c,v 1.1 2006/02/06 23:23:53 gdamore Exp $ */
+
+/*-
+ * Copyright (c) 2006 Itronix Inc.
+ * All rights reserved.
+ *
+ * Written by Garrett D'Amore for Itronix Inc.
+ *
+ * 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. The name of Itronix Inc. may not be used to endorse
+ * or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ITRONIX INC. ``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 ITRONIX INC. 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.
+ */
+
+/*
+ * Copyright 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Simon Burge for Wasabi Systems, Inc.
+ *
+ * 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:
Home |
Main Index |
Thread Index |
Old Index