Update of /cvsroot/linuxsh/linux/arch/sh/boards/mpc1211
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6166/arch/sh/boards/mpc1211
Modified Files:
setup.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: setup.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/mpc1211/setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- setup.c 7 Aug 2006 02:22:11 -0000 1.5
+++ setup.c 7 Aug 2006 06:27:25 -0000 1.6
@@ -11,14 +11,12 @@
#include <linux/hdreg.h>
#include <linux/ide.h>
#include <linux/interrupt.h>
-
#include <asm/io.h>
#include <asm/machvec.h>
#include <asm/mpc1211/mpc1211.h>
#include <asm/mpc1211/pci.h>
#include <asm/mpc1211/m1543c.h>
-
/* ALI15X3 SMBus address offsets */
#define SMBHSTSTS (0 + 0x3100)
#define SMBHSTCNT (1 + 0x3100)
@@ -51,11 +49,6 @@
#define ALI15X3_STS_TERM 0x80 /* terminated by abort */
#define ALI15X3_STS_ERR 0xE0 /* all the bad error bits */
-const char *get_system_type(void)
-{
- return "Interface MPC-1211(CTP/PCI/MPC-SH02)";
-}
-
static void __init pci_write_config(unsigned long busNo,
unsigned long devNo,
unsigned long fncNo,
@@ -206,7 +199,7 @@
return irq;
}
-void __init init_mpc1211_IRQ(void)
+static void __init init_mpc1211_IRQ(void)
{
int i;
/*
@@ -290,26 +283,10 @@
return 0;
}
-/*
- * The Machine Vector
- */
-
-struct sh_machine_vector mv_mpc1211 __initmv = {
- .mv_nr_irqs = 48,
- .mv_irq_demux = mpc1211_irq_demux,
- .mv_init_irq = init_mpc1211_IRQ,
-
-#ifdef CONFIG_HEARTBEAT
- .mv_heartbeat = heartbeat_mpc1211,
-#endif
-};
-
-ALIAS_MV(mpc1211)
-
/* arch/sh/boards/mpc1211/rtc.c */
void mpc1211_time_init(void);
-int __init platform_setup(void)
+static void __init mpc1211_setup(char **cmdline_p)
{
unsigned char spd_buf[128];
@@ -333,3 +310,18 @@
return 0;
}
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_mpc1211 __initmv = {
+ .mv_name = "Interface MPC-1211(CTP/PCI/MPC-SH02)",
+ .mv_setup = mpc1211_setup,
+ .mv_nr_irqs = 48,
+ .mv_irq_demux = mpc1211_irq_demux,
+ .mv_init_irq = init_mpc1211_IRQ,
+
+#ifdef CONFIG_HEARTBEAT
+ .mv_heartbeat = heartbeat_mpc1211,
+#endif
+};
+ALIAS_MV(mpc1211)
|
