[linuxsh-cvs] CVS: linux/arch/sh/boards/se/770x Makefile, 1.5, 1.6 setup.c, 1.5, 1.6 mach.c, 1.8, NONE

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

Update of /cvsroot/linuxsh/linux/arch/sh/boards/se/770x
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6166/arch/sh/boards/se/770x

Modified Files:
	Makefile setup.c 
Removed Files:
	mach.c 
Log Message:
Some more machvec overhauling and setup code cleanup. Kill off
get_system_type() and platform_setup(), we can do these both through the
machvec. While we're add it, kill off more useless mach.c's and drop some
legacy cruft from setup.c.



Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/se/770x/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	31 May 2005 14:49:59 -0000	1.5
+++ Makefile	7 Aug 2006 06:27:25 -0000	1.6
@@ -2,6 +2,5 @@
 # Makefile for the 770x SolutionEngine specific parts of the kernel
 #
 
-obj-y	 := mach.o setup.o io.o irq.o
-
+obj-y	 := setup.o io.o irq.o
 obj-$(CONFIG_HEARTBEAT) += led.o

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/se/770x/setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.c	4 Jan 2006 17:53:54 -0000	1.5
+++ setup.c	7 Aug 2006 06:27:26 -0000	1.6
@@ -7,16 +7,18 @@
  * Hitachi SolutionEngine Support.
  *
  */
-
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <asm/io.h>
 #include <asm/se.h>
 #include <asm/smc37c93x.h>
+#include <asm/machvec.h>
+
+void heartbeat_se(void);
+void init_se_IRQ(void);
 
 /*
  * Configure the Super I/O chip
@@ -27,7 +29,8 @@
 	outb_p(data, DATA_PORT);
 }
 
-static void __init init_smsc(void)
+/* XXX: Another candidate for a more generic cchip machine vector */
+static void __init smsc_setup(char **cmdline_p)
 {
 	outb_p(CONFIG_ENTER, CONFIG_PORT);
 	outb_p(CONFIG_ENTER, CONFIG_PORT);
@@ -70,16 +73,46 @@
 	outb_p(CONFIG_EXIT, CONFIG_PORT);
 }
 
-const char *get_system_type(void)
-{
-	return "SolutionEngine";
-}
-
 /*
- * Initialize the board
+ * The Machine Vector
  */
-void __init platform_setup(void)
-{
-	init_smsc();
-	/* XXX: RTC setting comes here */
-}
+struct sh_machine_vector mv_se __initmv = {
+	.mv_name		= "SolutionEngine",
+	.mv_setup		= smsc_setup,
+#if defined(CONFIG_CPU_SH4)
+	.mv_nr_irqs		= 48,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
+	.mv_nr_irqs		= 32,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7709)
+	.mv_nr_irqs		= 61,
+#elif defined(CONFIG_CPU_SUBTYPE_SH7705)
+	.mv_nr_irqs		= 86,
+#endif
+
+	.mv_inb			= se_inb,
+	.mv_inw			= se_inw,
+	.mv_inl			= se_inl,
+	.mv_outb		= se_outb,
+	.mv_outw		= se_outw,
+	.mv_outl		= se_outl,
+
+	.mv_inb_p		= se_inb_p,
+	.mv_inw_p		= se_inw,
+	.mv_inl_p		= se_inl,
+	.mv_outb_p		= se_outb_p,
+	.mv_outw_p		= se_outw,
+	.mv_outl_p		= se_outl,
+
+	.mv_insb		= se_insb,
+	.mv_insw		= se_insw,
+	.mv_insl		= se_insl,
+	.mv_outsb		= se_outsb,
+	.mv_outsw		= se_outsw,
+	.mv_outsl		= se_outsl,
+
+	.mv_init_irq		= init_se_IRQ,
+#ifdef CONFIG_HEARTBEAT
+	.mv_heartbeat		= heartbeat_se,
+#endif
+};
+ALIAS_MV(se)

--- mach.c DELETED ---