[Linux-mips-commits]CVS: linux/include/asm-mips bootinfo.h,1.28,1.29 vr41xx.h,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv28915/include/asm-mips

Modified Files:
	bootinfo.h vr41xx.h 
Log Message:
Imported Yoichi-san's Vr41xx patch, with some minor modifications.



Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- bootinfo.h	19 Feb 2002 17:17:53 -0000	1.28
+++ bootinfo.h	7 Mar 2002 03:16:54 -0000	1.29
@@ -175,6 +175,9 @@
 #define MACH_NEC_MOBILEPRO_780	4	/* NEC MobilePro 780 PDA */
 #define MACH_CASIO_E15		5	/* Casio Cassiopeia E15 */
 #define MACH_CASIO_BE300	6	/* Casio Cassiopeia BE-300 */
+#define MACH_CASIO_E55		7	/* Casio Cassiopeia E-55/65 */
+#define MACH_IBM_WORKPAD	8	/* IBM WorkPad z50 */
+#define MACH_VICTOR_MPC303 	9	/* Victor MP-C303/304 */
 
 #define CL_SIZE			(256)
 

Index: vr41xx.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/vr41xx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vr41xx.h	29 Oct 2001 08:20:55 -0000	1.2
+++ vr41xx.h	7 Mar 2002 03:16:55 -0000	1.3
@@ -4,7 +4,8 @@
  * Primary header for NEC VR41xx processors.
  *
  * Copyright (C) 1999 Michael Klar
- * Copyright (C) 2001 Paul Mundt <le...@ch...>
+ * Copyright (C) 2001, 2002 Paul Mundt
+ * Copyright (C) 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
@@ -15,6 +16,7 @@
 #define __ASM_MIPS_VR41XX_H
 
 #include <linux/config.h>
+#include <linux/interrupt.h>
 
 /*
  * Any code being written for a VR41xx device should be including this
@@ -38,6 +40,72 @@
 #elif defined(CONFIG_VR4181)
   #include <asm/vr4181/vr4181.h>
 #endif
+
+/*
+ * Bus Control Uint
+ */
+extern void vr41xx_bcu_init(void);
+
+/*
+ * Clock Mask Unit
+ */
+extern void vr41xx_clock_supply(u16 mask);
+extern void vr41xx_clock_mask(u16 mask);
+
+/*
+ * Interrupt Control Unit
+ */
+
+/* GIU Interrupt Numbers */
+#define GIUL_IRQ(x)	(40 + (x))
+#define GIUH_IRQ(x)	(56 + (x))
+
+struct irqcascade {
+	int cascade;
+	int (*get_irq_number)(int irq);
+};
+
+extern void vr41xx_board_irq_init(void);
+extern void vr41xx_cascade_irq(unsigned int irq, int (*get_irq_number)(int irq));
+
+/*
+ * Serial Interface Unit
+ */
+extern void vr41xx_siu_init(int line, int interface, int module);
+extern void vr41xx_siu_ifselect(int interface, int module);
+
+/* SIU interfaces */
+enum {
+	SIU_RS232C,
+	SIU_IRDA
+};
+
+/* IrDA interfaces */
+enum {
+	IRDA_SHARP = 1,
+	IRDA_TEMIC,
+	IRDA_HP
+};
+
+/*
+ * Debug Serial Interface Unit
+ */
+extern void vr41xx_dsiu_init(int line);
+
+/*
+ * PCI Control Unit
+ */
+extern void vr41xx_pciu_init(void);
+
+/*
+ * MISC
+ */
+extern void vr41xx_time_init(void);
+extern void vr41xx_timer_setup(struct irqaction *irq);
+
+extern void vr41xx_restart(char *command);
+extern void vr41xx_halt(void);
+extern void vr41xx_power_off(void);
 
 #endif /* __ASM_MIPS_VR41XX_H */