[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/vr4111/casio-e15 Makefile,1.1,1.2 setup.c,1.2,1.3

[Leblanc f. <fle...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15
In directory usw-pr-cvs1:/tmp/cvs-serv17935/arch/mips/vr41xx/vr4111/casio-e15

Modified Files:
	Makefile setup.c 
Log Message:
Update casio E15 projet to latest structure.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	10 Mar 2002 23:33:11 -0000	1.1
+++ Makefile	19 Mar 2002 14:22:21 -0000	1.2
@@ -15,9 +15,9 @@
 .S.o:
 	$(CC) $(AFLAGS) -c $< -o $@
 
-O_TARGET := casio.o
+O_TARGET := casio-e15.o
 		
-all: casio.o
+all: casio-e15.o
 
 obj-y	 += setup.o prom.o 
 

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c	11 Mar 2002 19:36:41 -0000	1.2
+++ setup.c	19 Mar 2002 14:22:21 -0000	1.3
@@ -16,89 +16,72 @@
  * for more details.
  *
  */
-
 #include <linux/config.h>
+#include <linux/init.h>
 #include <linux/console.h>
 #ifdef CONFIG_IDE
 #include <linux/ide.h>
 #endif
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <asm/time.h>
+#include <linux/ioport.h>
+
 #include <asm/reboot.h>
+#include <asm/time.h>
 #include <asm/vr41xx.h>
-#include <asm/io.h>
+#include <asm/vr41xx/e15.h>
 #ifdef CONFIG_PM_SUSPEND_WAKEUP
 #include <asm/power.h>
 #endif
 
-extern void vr41xx_restart(char *c);
-extern void vr4111_standby(void);
-extern void vr4111_suspend(void);
-extern void vr4111_hibernate(void);
-extern void vr4111_wait(void);
-extern void vr4111_time_init(void);
-extern void vr4111_timer_setup(void);
-
-extern void vr4111_init_serial(void);
 extern void vr41xx_xblink_led(unsigned int times, unsigned int time_on, unsigned int time_off);
 
+#ifdef CONFIG_BLK_DEV_INITRD
+extern unsigned long initrd_start, initrd_end;
+extern void * __rd_start, * __rd_end;
+#endif
+
 #ifdef CONFIG_BLK_DEV_IDE
 extern struct ide_ops std_ide_ops;
-//extern struct ide_ops vr41xx_ide_ops;
 #endif
 
 struct semaphore vr41xx_dma_sem;
 
-#ifdef CONFIG_PCMCIA
-void __init put_cf_reg(unsigned char reg, unsigned char val)
-{
-	/* PCMCIA controller (VG469) is mapped here */
-	outb(reg, 0x3e0);
-	outb(val, 0x3e1);
-}
-#endif
 
-void __init bus_error_init(void)
+void __init vr41xx_board_irq_init(void)
 {
 }
 
 void __init nec_vr41xx_setup(void)
 {
-	
-	set_io_port_base(VR41XX_PORT_BASE); 
-	isa_slot_offset = VR41XX_ISAMEM_BASE;
-
-	board_time_init = vr4111_time_init;
-	board_timer_setup = vr4111_timer_setup;
+	set_io_port_base(IO_PORT_BASE);
+	ioport_resource.start = IO_PORT_RESOURCE_START;
+	ioport_resource.end = IO_PORT_RESOURCE_END;
+	iomem_resource.start = IO_MEM_RESOURCE_START;
+	iomem_resource.end = IO_MEM_RESOURCE_END;
 
-#ifdef CONFIG_PM_SUSPEND_WAKEUP
-	_machine_restart = do_wakeup;
-#else
-	_machine_restart = vr41xx_restart;
+#ifdef CONFIG_BLK_DEV_INITRD
+	ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
+	initrd_start = (unsigned long)&__rd_start;
+	initrd_end = (unsigned long)&__rd_end;
 #endif
-	_machine_halt = vr4111_hibernate;
-	_machine_power_off = vr4111_suspend;
-	cpu_wait = vr4111_wait;
+	
+	_machine_restart = vr41xx_restart;
+	_machine_halt = vr41xx_halt;
+	_machine_power_off = vr41xx_power_off;
+
+	board_time_init = vr41xx_time_init;
+	board_timer_setup = vr41xx_timer_setup;
 	
 #ifdef CONFIG_BLK_DEV_IDE
 	ide_ops = &std_ide_ops;
-	//ide_ops = &vr41xx_ide_ops;
 #endif
 
 #ifdef CONFIG_FB
 	conswitchp = &dummy_con;
 #endif
 
-#ifdef CONFIG_PCMCIA
-	/* Reset the PCMCIA and CF and power them off */
-	put_cf_reg(0x03, 0x20);   /* Socket 0 */
-	put_cf_reg(0x43, 0x20);   /* Socket 1 */
-	put_cf_reg(0x02, 0x00);   /* Socket 0 */
-	put_cf_reg(0x42, 0x00);   /* Socket 1 */
-#endif
+	vr41xx_bcu_init();
 
-	vr4111_init_serial();
+	vr41xx_siu_init(0, SIU_RS232C, 0);
 	
 	// Insure that vr41xx_dma_sem is initialized as unlocked, even
 	// in the case of a failed hibernate/wakeup: