Menu
▾
▴
linuxconsole-commit
|
From: James S. <jsi...@us...> - 2003-02-01 18:57:46
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory sc8-pr-cvs1:/tmp/cvs-serv15026/linux/arch/ppc/platforms
Modified Files:
k2_setup.c lopec_setup.c mcpn765_setup.c menf1_setup.c
mvme5100_setup.c pcore_setup.c pplus_setup.c prep_setup.c
prpmc750_setup.c prpmc800_setup.c sandpoint_setup.c
spruce_setup.c
Log Message:
Synced to 2.5.59
Index: k2_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/k2_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- k2_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ k2_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -5,12 +5,10 @@
*
* Author: Matt Porter <mp...@mv...>
*
- * Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
@@ -314,12 +312,6 @@
i8259_init(NULL);
}
-static int
-k2_get_irq(struct pt_regs *regs)
-{
- return i8259_poll();
-}
-
void __init platform_init(unsigned long r3, unsigned long r4,
unsigned long r5, unsigned long r6, unsigned long r7)
{
@@ -332,7 +324,7 @@
ppc_md.setup_arch = k2_setup_arch;
ppc_md.show_cpuinfo = k2_show_cpuinfo;
ppc_md.init_IRQ = k2_init_irq;
- ppc_md.get_irq = k2_get_irq;
+ ppc_md.get_irq = i8259_irq;
ppc_md.find_end_of_memory = k2_find_end_of_memory;
ppc_md.setup_io_mappings = k2_map_io;
Index: lopec_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/lopec_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lopec_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ lopec_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -6,12 +6,10 @@
* Author: Dan Cox
* da...@mv...
*
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001-2002 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
Index: mcpn765_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/mcpn765_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mcpn765_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ mcpn765_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -6,12 +6,10 @@
* Author: Mark A. Greer
* mg...@mv...
*
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001-2002 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
/*
Index: menf1_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/menf1_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- menf1_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ menf1_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -1,16 +1,14 @@
/*
* arch/ppc/platforms/menf1_setup.c
-
+ *
* Board setup routines for MEN F1
*
* Author: Matt Porter <mp...@mv...>
*
- * Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
@@ -144,11 +142,6 @@
i8259_init(NULL);
}
-static int menf1_get_irq(struct pt_regs *regs)
-{
- return i8259_poll();
-}
-
/*
* Set BAT 3 to map 0xF0000000.
*/
@@ -253,7 +246,7 @@
ppc_md.setup_arch = menf1_setup_arch;
ppc_md.show_cpuinfo = menf1_show_cpuinfo;
ppc_md.init_IRQ = menf1_init_IRQ;
- ppc_md.get_irq = menf1_get_irq;
+ ppc_md.get_irq = i8259_irq;
ppc_md.find_end_of_memory = menf1_find_end_of_memory;
ppc_md.setup_io_mappings = menf1_map_io;
Index: mvme5100_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/mvme5100_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mvme5100_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ mvme5100_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -5,12 +5,10 @@
*
* Author: Matt Porter <mp...@mv...>
*
- * Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
Index: pcore_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pcore_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pcore_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ pcore_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -5,12 +5,10 @@
*
* Author: Matt Porter <mp...@mv...>
*
- * Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
Index: pplus_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pplus_setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pplus_setup.c 23 Nov 2002 00:55:48 -0000 1.5
+++ pplus_setup.c 1 Feb 2003 18:57:12 -0000 1.6
@@ -9,16 +9,10 @@
* Cort Dougan, Johnnie Peters, Matt Porter, and
* Troy Benjegerdes.
*
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 2001-2002 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
@@ -220,12 +214,6 @@
}
}
-static int
-pplus_get_irq(struct pt_regs *regs)
-{
- return i8259_poll();
-}
-
static void __init
pplus_init_IRQ(void)
{
@@ -480,7 +468,7 @@
ppc_md.irq_cannonicalize = pplus_irq_cannonicalize;
ppc_md.init_IRQ = pplus_init_IRQ;
/* this gets changed later on if we have an OpenPIC -- Cort */
- ppc_md.get_irq = pplus_get_irq;
+ ppc_md.get_irq = i8259_irq;
ppc_md.init = pplus_init2;
ppc_md.restart = pplus_restart;
Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- prep_setup.c 23 Nov 2002 00:55:48 -0000 1.8
+++ prep_setup.c 1 Feb 2003 18:57:12 -0000 1.9
@@ -56,6 +56,7 @@
#include <asm/mpc10x.h>
#include <asm/i8259.h>
#include <asm/open_pic.h>
+#include <asm/pci-bridge.h>
unsigned char ucSystemType;
unsigned char ucBoardRev;
@@ -987,12 +988,24 @@
prep_init_IRQ(void)
{
int i;
+ unsigned int pci_viddid, pci_did;
if (OpenPIC_Addr != NULL)
openpic_init(NUM_8259_INTERRUPTS);
for ( i = 0 ; i < NUM_8259_INTERRUPTS ; i++ )
irq_desc[i].handler = &i8259_pic;
- i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR);
+ /* If we have a Raven PCI bridge or a Hawk PCI bridge / Memory
+ * controller, we poll (as they have a different int-ack address). */
+ early_read_config_dword(0, 0, 0, PCI_VENDOR_ID, &pci_viddid);
+ pci_did = (pci_viddid & 0xffff0000) >> 16;
+ if (((pci_viddid & 0xffff) == PCI_VENDOR_ID_MOTOROLA)
+ && ((pci_did == PCI_DEVICE_ID_MOTOROLA_RAVEN)
+ || (pci_did == PCI_DEVICE_ID_MOTOROLA_HAWK)))
+ i8259_init(0);
+ else
+ /* PCI interrupt ack address given in section 6.1.8 of the
+ * PReP specification. */
+ i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR);
}
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
Index: prpmc750_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prpmc750_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prpmc750_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ prpmc750_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -5,12 +5,10 @@
*
* Author: Matt Porter <mp...@mv...>
*
- * Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
@@ -194,12 +192,6 @@
prpmc750_power_off(void)
{
prpmc750_halt();
-}
-
-/* Resolves the open_pic.c build without including i8259.c */
-int i8259_poll(void)
-{
- return 0;
}
static void __init
Index: prpmc800_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prpmc800_setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prpmc800_setup.c 23 Nov 2002 00:55:48 -0000 1.1
+++ prpmc800_setup.c 1 Feb 2003 18:57:12 -0000 1.2
@@ -2,12 +2,10 @@
*
* Author: Dale Farnsworth <dal...@mv...>
*
- * Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2001 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
@@ -188,12 +186,6 @@
prpmc800_power_off(void)
{
prpmc800_halt();
-}
-
-/* Resolves the open_pic.c build without including i8259.c */
-int i8259_poll()
-{
- return 0;
}
static void __init
Index: sandpoint_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/sandpoint_setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sandpoint_setup.c 23 Nov 2002 00:55:48 -0000 1.6
+++ sandpoint_setup.c 1 Feb 2003 18:57:12 -0000 1.7
@@ -6,12 +6,10 @@
* Author: Mark A. Greer
* mg...@mv...
*
- * Copyright 2000-2002 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * 2000-2002 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
/*
@@ -331,7 +329,7 @@
irq = openpic_irq();
if (irq == SANDPOINT_SIO_IRQ) {
- cascade_irq = i8259_poll();
+ cascade_irq = i8259_irq(regs);
if (cascade_irq != -1) {
irq = cascade_irq;
Index: spruce_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/spruce_setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- spruce_setup.c 23 Nov 2002 00:55:48 -0000 1.4
+++ spruce_setup.c 1 Feb 2003 18:57:12 -0000 1.5
@@ -6,27 +6,10 @@
* Authors: Johnnie Peters <jp...@mv...>
* Matt Porter <mp...@mv...>
*
- * Copyright 2001-2002 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``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.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 2001-2002 (c) MontaVista, Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2.1. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
*/
#include <linux/config.h>
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X