Skip to content

L
linux-davinci-2.6.23
Commit 2c7834a6 authored by Paul Mundt's avatar Paul Mundt
Browse files
Options

sh: machvec rework. 

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.
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent bc8fb5d0
Show whitespace changes
Inline Side-by-side
Showing with 481 additions and 776 deletions
arch/sh/boards/bigsur/setup.c
View file @ 2c7834a6
...@@ -41,31 +41,7 @@ ...@@ -41,31 +41,7 @@
// Big Sur Init Routines // Big Sur Init Routines
/*===========================================================*/ /*===========================================================*/
const char *get_system_type(void) static void __init bigsur_setup(char **cmdline_p)
{
return "Big Sur";
}
/*
* The Machine Vector
*/
extern void heartbeat_bigsur(void);
extern void init_bigsur_IRQ(void);
struct sh_machine_vector mv_bigsur __initmv = {
.mv_nr_irqs = NR_IRQS, // Defined in <asm/irq.h>
.mv_isa_port2addr = bigsur_isa_port2addr,
.mv_irq_demux = bigsur_irq_demux,
.mv_init_irq = init_bigsur_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_bigsur,
#endif
};
ALIAS_MV(bigsur)
int __init platform_setup(void)
{ {
/* Mask all 2nd level IRQ's */ /* Mask all 2nd level IRQ's */
outb(-1,BIGSUR_IMR0); outb(-1,BIGSUR_IMR0);
...@@ -89,7 +65,24 @@ int __init platform_setup(void) ...@@ -89,7 +65,24 @@ int __init platform_setup(void)
outw(1, BIGSUR_ETHR+0xe); outw(1, BIGSUR_ETHR+0xe);
/* set the IO port to BIGSUR_ETHER_IOPORT */ /* set the IO port to BIGSUR_ETHER_IOPORT */
outw(BIGSUR_ETHER_IOPORT<<3, BIGSUR_ETHR+0x2); outw(BIGSUR_ETHER_IOPORT<<3, BIGSUR_ETHR+0x2);
return 0;
} }
/*
* The Machine Vector
*/
extern void heartbeat_bigsur(void);
extern void init_bigsur_IRQ(void);
struct sh_machine_vector mv_bigsur __initmv = {
.mv_name = "Big Sur",
.mv_setup = bigsur_setup,
.mv_isa_port2addr = bigsur_isa_port2addr,
.mv_irq_demux = bigsur_irq_demux,
.mv_init_irq = init_bigsur_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_bigsur,
#endif
};
ALIAS_MV(bigsur)
arch/sh/boards/dreamcast/setup.c
View file @ 2c7834a6
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/device.h> #include <linux/device.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/rtc.h> #include <asm/rtc.h>
...@@ -37,24 +36,7 @@ extern int systemasic_irq_demux(int); ...@@ -37,24 +36,7 @@ extern int systemasic_irq_demux(int);
void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); void *dreamcast_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
int dreamcast_consistent_free(struct device *, size_t, void *, dma_addr_t); int dreamcast_consistent_free(struct device *, size_t, void *, dma_addr_t);
const char *get_system_type(void) static void __init dreamcast_setup(char **cmdline_p)
{
return "Sega Dreamcast";
}
struct sh_machine_vector mv_dreamcast __initmv = {
.mv_nr_irqs = NR_IRQS,
.mv_irq_demux = systemasic_irq_demux,
#ifdef CONFIG_PCI
.mv_consistent_alloc = dreamcast_consistent_alloc,
.mv_consistent_free = dreamcast_consistent_free,
#endif
};
ALIAS_MV(dreamcast)
int __init platform_setup(void)
{ {
int i; int i;
...@@ -76,6 +58,16 @@ int __init platform_setup(void) ...@@ -76,6 +58,16 @@ int __init platform_setup(void)
if (gapspci_init() < 0) if (gapspci_init() < 0)
printk(KERN_WARNING "GAPSPCI was not detected.\n"); printk(KERN_WARNING "GAPSPCI was not detected.\n");
#endif #endif
return 0;
} }
struct sh_machine_vector mv_dreamcast __initmv = {
.mv_name = "Sega Dreamcast",
.mv_setup = dreamcast_setup,
.mv_irq_demux = systemasic_irq_demux,
#ifdef CONFIG_PCI
.mv_consistent_alloc = dreamcast_consistent_alloc,
.mv_consistent_free = dreamcast_consistent_free,
#endif
};
ALIAS_MV(dreamcast)
arch/sh/boards/ec3104/setup.c
View file @ 2c7834a6
...@@ -21,22 +21,36 @@ ...@@ -21,22 +21,36 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/mach/ec3104.h> #include <asm/mach/ec3104.h>
const char *get_system_type(void) static void __init ec3104_setup(char **cmdline_p)
{ {
return "EC3104"; char str[8];
int i;
for (i=0; i<8; i++)
str[i] = ctrl_readb(EC3104_BASE + i);
for (i = EC3104_IRQBASE; i < EC3104_IRQBASE + 32; i++)
irq_desc[i].handler = &ec3104_int;
printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n",
str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE);
/* mask all interrupts. this should have been done by the boot
* loader for us but we want to be sure ... */
ctrl_writel(0xffffffff, EC3104_IMR);
} }
/* /*
* The Machine Vector * The Machine Vector
*/ */
struct sh_machine_vector mv_ec3104 __initmv = { struct sh_machine_vector mv_ec3104 __initmv = {
.mv_name = "EC3104",
.mv_setup = ec3104_setup,
.mv_nr_irqs = 96, .mv_nr_irqs = 96,
.mv_inb = ec3104_inb, .mv_inb = ec3104_inb,
...@@ -48,31 +62,4 @@ struct sh_machine_vector mv_ec3104 __initmv = { ...@@ -48,31 +62,4 @@ struct sh_machine_vector mv_ec3104 __initmv = {
.mv_irq_demux = ec3104_irq_demux, .mv_irq_demux = ec3104_irq_demux,
}; };
ALIAS_MV(ec3104) ALIAS_MV(ec3104)
int __init platform_setup(void)
{
char str[8];
int i;
if (0)
return 0;
for (i=0; i<8; i++)
str[i] = ctrl_readb(EC3104_BASE + i);
for (i = EC3104_IRQBASE; i < EC3104_IRQBASE + 32; i++)
irq_desc[i].chip = &ec3104_int;
printk("initializing EC3104 \"%.8s\" at %08x, IRQ %d, IRQ base %d\n",
str, EC3104_BASE, EC3104_IRQ, EC3104_IRQBASE);
/* mask all interrupts. this should have been done by the boot
* loader for us but we want to be sure ... */
ctrl_writel(0xffffffff, EC3104_IMR);
return 0;
}
arch/sh/boards/hp6xx/Makefile
View file @ 2c7834a6
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Makefile for the HP6xx specific parts of the kernel # Makefile for the HP6xx specific parts of the kernel
# #
obj-y := mach.o setup.o obj-y := setup.o
obj-$(CONFIG_PM) += pm.o pm_wakeup.o obj-$(CONFIG_PM) += pm.o pm_wakeup.o
obj-$(CONFIG_APM) += hp6xx_apm.o obj-$(CONFIG_APM) += hp6xx_apm.o
arch/sh/boards/hp6xx/setup.c
View file @ 2c7834a6
...@@ -19,12 +19,7 @@ ...@@ -19,12 +19,7 @@
#define SCPCR 0xa4000116 #define SCPCR 0xa4000116
#define SCPDR 0xa4000136 #define SCPDR 0xa4000136
const char *get_system_type(void) static void __init hp6xx_setup(char **cmdline_p)
{
return "HP6xx";
}
int __init platform_setup(void)
{ {
u8 v8; u8 v8;
u16 v; u16 v;
...@@ -64,6 +59,42 @@ int __init platform_setup(void) ...@@ -64,6 +59,42 @@ int __init platform_setup(void)
v &= ~SCPCR_TS_MASK; v &= ~SCPCR_TS_MASK;
v |= SCPCR_TS_ENABLE; v |= SCPCR_TS_ENABLE;
ctrl_outw(v, SCPCR); ctrl_outw(v, SCPCR);
return 0;
} }
/*
* XXX: This is stupid, we should have a generic machine vector for the cchips
* and just wrap the platform setup code in to this, as it's the only thing
* that ends up being different.
*/
struct sh_machine_vector mv_hp6xx __initmv = {
.mv_name = "hp6xx",
.mv_setup = hp6xx_setup,
.mv_nr_irqs = HD64461_IRQBASE + HD64461_IRQ_NUM,
.mv_inb = hd64461_inb,
.mv_inw = hd64461_inw,
.mv_inl = hd64461_inl,
.mv_outb = hd64461_outb,
.mv_outw = hd64461_outw,
.mv_outl = hd64461_outl,
.mv_inb_p = hd64461_inb_p,
.mv_inw_p = hd64461_inw,
.mv_inl_p = hd64461_inl,
.mv_outb_p = hd64461_outb_p,
.mv_outw_p = hd64461_outw,
.mv_outl_p = hd64461_outl,
.mv_insb = hd64461_insb,
.mv_insw = hd64461_insw,
.mv_insl = hd64461_insl,
.mv_outsb = hd64461_outsb,
.mv_outsw = hd64461_outsw,
.mv_outsl = hd64461_outsl,
.mv_readw = hd64461_readw,
.mv_writew = hd64461_writew,
.mv_irq_demux = hd64461_irq_demux,
};
ALIAS_MV(hp6xx)
arch/sh/boards/landisk/setup.c
View file @ 2c7834a6
...@@ -69,42 +69,6 @@ static void heartbeat_landisk(void) ...@@ -69,42 +69,6 @@ static void heartbeat_landisk(void)
landisk_buzzerparam >>= 1; landisk_buzzerparam >>= 1;
} }
/*
* The Machine Vector
*/
struct sh_machine_vector mv_landisk __initmv = {
.mv_nr_irqs = 72,
.mv_inb = landisk_inb,
.mv_inw = landisk_inw,
.mv_inl = landisk_inl,
.mv_outb = landisk_outb,
.mv_outw = landisk_outw,
.mv_outl = landisk_outl,
.mv_inb_p = landisk_inb_p,
.mv_inw_p = landisk_inw,
.mv_inl_p = landisk_inl,
.mv_outb_p = landisk_outb_p,
.mv_outw_p = landisk_outw,
.mv_outl_p = landisk_outl,
.mv_insb = landisk_insb,
.mv_insw = landisk_insw,
.mv_insl = landisk_insl,
.mv_outsb = landisk_outsb,
.mv_outsw = landisk_outsw,
.mv_outsl = landisk_outsl,
.mv_ioport_map = landisk_ioport_map,
.mv_init_irq = init_landisk_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_landisk,
#endif
};
ALIAS_MV(landisk)
const char *get_system_type(void)
{
return "LANDISK";
}
static void landisk_power_off(void) static void landisk_power_off(void)
{ {
ctrl_outb(0x01, PA_SHUTDOWN); ctrl_outb(0x01, PA_SHUTDOWN);
...@@ -132,16 +96,6 @@ static void check_usl5p(void) ...@@ -132,16 +96,6 @@ static void check_usl5p(void)
} }
} }
void __init platform_setup(void)
{
landisk_buzzerparam = 0;
check_usl5p();
printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
board_time_init = landisk_time_init;
pm_power_off = landisk_power_off;
}
void *area5_io_base; void *area5_io_base;
void *area6_io_base; void *area6_io_base;
...@@ -176,4 +130,48 @@ static int __init landisk_cf_init(void) ...@@ -176,4 +130,48 @@ static int __init landisk_cf_init(void)
return 0; return 0;
} }
__initcall(landisk_cf_init); static void __init landisk_setup(char **cmdline_p)
{
device_initcall(landisk_cf_init);
landisk_buzzerparam = 0;
check_usl5p();
printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
board_time_init = landisk_time_init;
pm_power_off = landisk_power_off;
}
/*
* The Machine Vector
*/
struct sh_machine_vector mv_landisk __initmv = {
.mv_name = "LANDISK",
.mv_setup = landisk_setup,
.mv_nr_irqs = 72,
.mv_inb = landisk_inb,
.mv_inw = landisk_inw,
.mv_inl = landisk_inl,
.mv_outb = landisk_outb,
.mv_outw = landisk_outw,
.mv_outl = landisk_outl,
.mv_inb_p = landisk_inb_p,
.mv_inw_p = landisk_inw,
.mv_inl_p = landisk_inl,
.mv_outb_p = landisk_outb_p,
.mv_outw_p = landisk_outw,
.mv_outl_p = landisk_outl,
.mv_insb = landisk_insb,
.mv_insw = landisk_insw,
.mv_insl = landisk_insl,
.mv_outsb = landisk_outsb,
.mv_outsw = landisk_outsw,
.mv_outsl = landisk_outsl,
.mv_ioport_map = landisk_ioport_map,
.mv_init_irq = init_landisk_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_landisk,
#endif
};
ALIAS_MV(landisk)
arch/sh/boards/mpc1211/setup.c
View file @ 2c7834a6
...@@ -10,14 +10,12 @@ ...@@ -10,14 +10,12 @@
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/mpc1211/mpc1211.h> #include <asm/mpc1211/mpc1211.h>
#include <asm/mpc1211/pci.h> #include <asm/mpc1211/pci.h>
#include <asm/mpc1211/m1543c.h> #include <asm/mpc1211/m1543c.h>
/* ALI15X3 SMBus address offsets */ /* ALI15X3 SMBus address offsets */
#define SMBHSTSTS (0 + 0x3100) #define SMBHSTSTS (0 + 0x3100)
#define SMBHSTCNT (1 + 0x3100) #define SMBHSTCNT (1 + 0x3100)
...@@ -50,11 +48,6 @@ ...@@ -50,11 +48,6 @@
#define ALI15X3_STS_TERM 0x80 /* terminated by abort */ #define ALI15X3_STS_TERM 0x80 /* terminated by abort */
#define ALI15X3_STS_ERR 0xE0 /* all the bad error bits */ #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, static void __init pci_write_config(unsigned long busNo,
unsigned long devNo, unsigned long devNo,
unsigned long fncNo, unsigned long fncNo,
...@@ -205,7 +198,7 @@ int mpc1211_irq_demux(int irq) ...@@ -205,7 +198,7 @@ int mpc1211_irq_demux(int irq)
return irq; return irq;
} }
void __init init_mpc1211_IRQ(void) static void __init init_mpc1211_IRQ(void)
{ {
int i; int i;
/* /*
...@@ -289,26 +282,10 @@ static int put_smb_blk(unsigned char *p, int address, int command, int no) ...@@ -289,26 +282,10 @@ static int put_smb_blk(unsigned char *p, int address, int command, int no)
return 0; 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 */ /* arch/sh/boards/mpc1211/rtc.c */
void mpc1211_time_init(void); void mpc1211_time_init(void);
int __init platform_setup(void) static void __init mpc1211_setup(char **cmdline_p)
{ {
unsigned char spd_buf[128]; unsigned char spd_buf[128];
...@@ -332,3 +309,18 @@ int __init platform_setup(void) ...@@ -332,3 +309,18 @@ int __init platform_setup(void)
return 0; 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)
arch/sh/boards/renesas/edosk7705/setup.c
View file @ 2c7834a6
...@@ -8,19 +8,21 @@ ...@@ -8,19 +8,21 @@
* Modified for edosk7705 development * Modified for edosk7705 development
* board by S. Dunn, 2003. * board by S. Dunn, 2003.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/machvec_init.h>
#include <asm/edosk7705/io.h> #include <asm/edosk7705/io.h>
static void init_edosk7705(void); static void __init sh_edosk7705_init_irq(void)
{
/* This is the Ethernet interrupt */
make_imask_irq(0x09);
}
/* /*
* The Machine Vector * The Machine Vector
*/ */
struct sh_machine_vector mv_edosk7705 __initmv = { struct sh_machine_vector mv_edosk7705 __initmv = {
.mv_name = "EDOSK7705",
.mv_nr_irqs = 80, .mv_nr_irqs = 80,
.mv_inb = sh_edosk7705_inb, .mv_inb = sh_edosk7705_inb,
...@@ -37,23 +39,6 @@ struct sh_machine_vector mv_edosk7705 __initmv = { ...@@ -37,23 +39,6 @@ struct sh_machine_vector mv_edosk7705 __initmv = {
.mv_outsl = sh_edosk7705_outsl, .mv_outsl = sh_edosk7705_outsl,
.mv_isa_port2addr = sh_edosk7705_isa_port2addr, .mv_isa_port2addr = sh_edosk7705_isa_port2addr,
.mv_init_irq = init_edosk7705, .mv_init_irq = sh_edosk7705_init_irq,
}; };
ALIAS_MV(edosk7705) ALIAS_MV(edosk7705)
static void __init init_edosk7705(void)
{
/* This is the Ethernet interrupt */
make_imask_irq(0x09);
}
const char *get_system_type(void)
{
return "EDOSK7705";
}
void __init platform_setup(void)
{
/* Nothing .. */
}
arch/sh/boards/renesas/hs7751rvoip/setup.c
View file @ 2c7834a6
/* /*
* linux/arch/sh/kernel/setup_hs7751rvoip.c * Renesas Technology Sales HS7751RVoIP Support.
* *
* Copyright (C) 2000 Kazumoto Kojima * Copyright (C) 2000 Kazumoto Kojima
* *
* Renesas Technology Sales HS7751RVoIP Support.
*
* Modified for HS7751RVoIP by * Modified for HS7751RVoIP by
* Atom Create Engineering Co., Ltd. 2002. * Atom Create Engineering Co., Ltd. 2002.
* Lineo uSolutions, Inc. 2003. * Lineo uSolutions, Inc. 2003.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -23,8 +20,6 @@ ...@@ -23,8 +20,6 @@
#include <asm/rtc.h> #include <asm/rtc.h>
#include <asm/irq.h> #include <asm/irq.h>
unsigned int debug_counter;
static void __init hs7751rvoip_init_irq(void) static void __init hs7751rvoip_init_irq(void)
{ {
#if defined(CONFIG_HS7751RVOIP_CODEC) #if defined(CONFIG_HS7751RVOIP_CODEC)
...@@ -35,56 +30,11 @@ static void __init hs7751rvoip_init_irq(void) ...@@ -35,56 +30,11 @@ static void __init hs7751rvoip_init_irq(void)
init_hs7751rvoip_IRQ(); init_hs7751rvoip_IRQ();
} }
struct sh_machine_vector mv_hs7751rvoip __initmv = {
.mv_nr_irqs = 72,
.mv_inb = hs7751rvoip_inb,
.mv_inw = hs7751rvoip_inw,
.mv_inl = hs7751rvoip_inl,
.mv_outb = hs7751rvoip_outb,
.mv_outw = hs7751rvoip_outw,
.mv_outl = hs7751rvoip_outl,
.mv_inb_p = hs7751rvoip_inb_p,
.mv_inw_p = hs7751rvoip_inw,
.mv_inl_p = hs7751rvoip_inl,
.mv_outb_p = hs7751rvoip_outb_p,
.mv_outw_p = hs7751rvoip_outw,
.mv_outl_p = hs7751rvoip_outl,
.mv_insb = hs7751rvoip_insb,
.mv_insw = hs7751rvoip_insw,
.mv_insl = hs7751rvoip_insl,
.mv_outsb = hs7751rvoip_outsb,
.mv_outsw = hs7751rvoip_outsw,
.mv_outsl = hs7751rvoip_outsl,
.mv_init_irq = hs7751rvoip_init_irq,
.mv_ioport_map = hs7751rvoip_ioport_map,
};
ALIAS_MV(hs7751rvoip)
const char *get_system_type(void)
{
return "HS7751RVoIP";
}
static void hs7751rvoip_power_off(void) static void hs7751rvoip_power_off(void)
{ {
ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR); ctrl_outw(ctrl_inw(PA_OUTPORTR) & 0xffdf, PA_OUTPORTR);
} }
/*
* Initialize the board
*/
void __init platform_setup(void)
{
printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
ctrl_outb(0xf0, PA_OUTPORTR);
pm_power_off = hs7751rvoip_power_off;
debug_counter = 0;
}
void *area5_io8_base; void *area5_io8_base;
void *area6_io8_base; void *area6_io8_base;
void *area5_io16_base; void *area5_io16_base;
...@@ -127,4 +77,46 @@ static int __init hs7751rvoip_cf_init(void) ...@@ -127,4 +77,46 @@ static int __init hs7751rvoip_cf_init(void)
return 0; return 0;
} }
__initcall(hs7751rvoip_cf_init); /*
* Initialize the board
*/
static void __init hs7751rvoip_setup(char **cmdline_p)
{
device_initcall(hs7751rvoip_cf_init);
ctrl_outb(0xf0, PA_OUTPORTR);
pm_power_off = hs7751rvoip_power_off;
printk(KERN_INFO "Renesas Technology Sales HS7751RVoIP-2 support.\n");
}
struct sh_machine_vector mv_hs7751rvoip __initmv = {
.mv_name = "HS7751RVoIP",
.mv_setup = hs7751rvoip_setup,
.mv_nr_irqs = 72,
.mv_inb = hs7751rvoip_inb,
.mv_inw = hs7751rvoip_inw,
.mv_inl = hs7751rvoip_inl,
.mv_outb = hs7751rvoip_outb,
.mv_outw = hs7751rvoip_outw,
.mv_outl = hs7751rvoip_outl,
.mv_inb_p = hs7751rvoip_inb_p,
.mv_inw_p = hs7751rvoip_inw,
.mv_inl_p = hs7751rvoip_inl,
.mv_outb_p = hs7751rvoip_outb_p,
.mv_outw_p = hs7751rvoip_outw,
.mv_outl_p = hs7751rvoip_outl,
.mv_insb = hs7751rvoip_insb,
.mv_insw = hs7751rvoip_insw,
.mv_insl = hs7751rvoip_insl,
.mv_outsb = hs7751rvoip_outsb,
.mv_outsw = hs7751rvoip_outsw,
.mv_outsl = hs7751rvoip_outsl,
.mv_init_irq = hs7751rvoip_init_irq,
.mv_ioport_map = hs7751rvoip_ioport_map,
};
ALIAS_MV(hs7751rvoip)
arch/sh/boards/renesas/r7780rp/setup.c
View file @ 2c7834a6
...@@ -20,41 +20,6 @@ ...@@ -20,41 +20,6 @@
extern void heartbeat_r7780rp(void); extern void heartbeat_r7780rp(void);
extern void init_r7780rp_IRQ(void); extern void init_r7780rp_IRQ(void);
/*
* The Machine Vector
*/
struct sh_machine_vector mv_r7780rp __initmv = {
.mv_nr_irqs = 109,
.mv_inb = r7780rp_inb,
.mv_inw = r7780rp_inw,
.mv_inl = r7780rp_inl,
.mv_outb = r7780rp_outb,
.mv_outw = r7780rp_outw,
.mv_outl = r7780rp_outl,
.mv_inb_p = r7780rp_inb_p,
.mv_inw_p = r7780rp_inw,
.mv_inl_p = r7780rp_inl,
.mv_outb_p = r7780rp_outb_p,
.mv_outw_p = r7780rp_outw,
.mv_outl_p = r7780rp_outl,
.mv_insb = r7780rp_insb,
.mv_insw = r7780rp_insw,
.mv_insl = r7780rp_insl,
.mv_outsb = r7780rp_outsb,
.mv_outsw = r7780rp_outsw,
.mv_outsl = r7780rp_outsl,
.mv_ioport_map = r7780rp_ioport_map,
.mv_init_irq = init_r7780rp_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_r7780rp,
#endif
};
ALIAS_MV(r7780rp)
static struct resource m66596_usb_host_resources[] = { static struct resource m66596_usb_host_resources[] = {
[0] = { [0] = {
.start = 0xa4800000, .start = 0xa4800000,
...@@ -88,7 +53,6 @@ static int __init r7780rp_devices_setup(void) ...@@ -88,7 +53,6 @@ static int __init r7780rp_devices_setup(void)
return platform_add_devices(r7780rp_devices, return platform_add_devices(r7780rp_devices,
ARRAY_SIZE(r7780rp_devices)); ARRAY_SIZE(r7780rp_devices));
} }
__initcall(r7780rp_devices_setup);
/* /*
* Platform specific clocks * Platform specific clocks
...@@ -117,11 +81,6 @@ static struct clk *r7780rp_clocks[] = { ...@@ -117,11 +81,6 @@ static struct clk *r7780rp_clocks[] = {
&ivdr_clk, &ivdr_clk,
}; };
const char *get_system_type(void)
{
return "Highlander R7780RP-1";
}
static void r7780rp_power_off(void) static void r7780rp_power_off(void)
{ {
#ifdef CONFIG_SH_R7780MP #ifdef CONFIG_SH_R7780MP
...@@ -132,11 +91,13 @@ static void r7780rp_power_off(void) ...@@ -132,11 +91,13 @@ static void r7780rp_power_off(void)
/* /*
* Initialize the board * Initialize the board
*/ */
void __init platform_setup(void) static void __init r7780rp_setup(char **cmdline_p)
{ {
u16 ver = ctrl_inw(PA_VERREG); u16 ver = ctrl_inw(PA_VERREG);
int i; int i;
device_initcall(r7780rp_devices_setup);
printk(KERN_INFO "Renesas Solutions Highlander R7780RP-1 support.\n"); printk(KERN_INFO "Renesas Solutions Highlander R7780RP-1 support.\n");
printk(KERN_INFO "Board version: %d (revision %d), " printk(KERN_INFO "Board version: %d (revision %d), "
...@@ -162,3 +123,41 @@ void __init platform_setup(void) ...@@ -162,3 +123,41 @@ void __init platform_setup(void)
pm_power_off = r7780rp_power_off; pm_power_off = r7780rp_power_off;
} }
/*
* The Machine Vector
*/
struct sh_machine_vector mv_r7780rp __initmv = {
.mv_name = "Highlander R7780RP-1",
.mv_setup = r7780rp_setup,
.mv_nr_irqs = 109,
.mv_inb = r7780rp_inb,
.mv_inw = r7780rp_inw,
.mv_inl = r7780rp_inl,
.mv_outb = r7780rp_outb,
.mv_outw = r7780rp_outw,
.mv_outl = r7780rp_outl,
.mv_inb_p = r7780rp_inb_p,
.mv_inw_p = r7780rp_inw,
.mv_inl_p = r7780rp_inl,
.mv_outb_p = r7780rp_outb_p,
.mv_outw_p = r7780rp_outw,
.mv_outl_p = r7780rp_outl,
.mv_insb = r7780rp_insb,
.mv_insw = r7780rp_insw,
.mv_insl = r7780rp_insl,
.mv_outsb = r7780rp_outsb,
.mv_outsw = r7780rp_outsw,
.mv_outsl = r7780rp_outsl,
.mv_ioport_map = r7780rp_ioport_map,
.mv_init_irq = init_r7780rp_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_r7780rp,
#endif
};
ALIAS_MV(r7780rp)
arch/sh/boards/renesas/rts7751r2d/Makefile
View file @ 2c7834a6
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
# Makefile for the RTS7751R2D specific parts of the kernel # Makefile for the RTS7751R2D specific parts of the kernel
# #
obj-y := mach.o setup.o io.o irq.o led.o obj-y := setup.o io.o irq.o
obj-$(CONFIG_HEARTBEAT) += led.o
arch/sh/boards/renesas/rts7751r2d/mach.c deleted 100644 → 0
View file @ bc8fb5d0
/*
* linux/arch/sh/kernel/mach_rts7751r2d.c
*
* Minor tweak of mach_se.c file to reference rts7751r2d-specific items.
*
* May be copied or modified under the terms of the GNU General Public
* License. See linux/COPYING for more information.
*
* Machine vector for the Renesas Technology sales RTS7751R2D
*/
#include <linux/init.h>
#include <linux/types.h>
#include <asm/machvec.h>
#include <asm/rtc.h>
#include <asm/irq.h>
#include <asm/mach/rts7751r2d.h>
extern void heartbeat_rts7751r2d(void);
extern void init_rts7751r2d_IRQ(void);
extern int rts7751r2d_irq_demux(int irq);
extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
/*
* The Machine Vector
*/
struct sh_machine_vector mv_rts7751r2d __initmv = {
.mv_nr_irqs = 72,
.mv_inb = rts7751r2d_inb,
.mv_inw = rts7751r2d_inw,
.mv_inl = rts7751r2d_inl,
.mv_outb = rts7751r2d_outb,
.mv_outw = rts7751r2d_outw,
.mv_outl = rts7751r2d_outl,
.mv_inb_p = rts7751r2d_inb_p,
.mv_inw_p = rts7751r2d_inw,
.mv_inl_p = rts7751r2d_inl,
.mv_outb_p = rts7751r2d_outb_p,
.mv_outw_p = rts7751r2d_outw,
.mv_outl_p = rts7751r2d_outl,
.mv_insb = rts7751r2d_insb,
.mv_insw = rts7751r2d_insw,
.mv_insl = rts7751r2d_insl,
.mv_outsb = rts7751r2d_outsb,
.mv_outsw = rts7751r2d_outsw,
.mv_outsl = rts7751r2d_outsl,
.mv_init_irq = init_rts7751r2d_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_rts7751r2d,
#endif
.mv_irq_demux = rts7751r2d_irq_demux,
#ifdef CONFIG_USB_OHCI_HCD
.mv_consistent_alloc = voyagergx_consistent_alloc,
.mv_consistent_free = voyagergx_consistent_free,
#endif
};
ALIAS_MV(rts7751r2d)
arch/sh/boards/renesas/rts7751r2d/setup.c
View file @ 2c7834a6
...@@ -13,9 +13,17 @@ ...@@ -13,9 +13,17 @@
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machvec.h>
#include <asm/mach/rts7751r2d.h> #include <asm/mach/rts7751r2d.h>
#include <asm/voyagergx.h> #include <asm/voyagergx.h>
extern void heartbeat_rts7751r2d(void);
extern void init_rts7751r2d_IRQ(void);
extern int rts7751r2d_irq_demux(int irq);
extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
static struct plat_serial8250_port uart_platform_data[] = { static struct plat_serial8250_port uart_platform_data[] = {
{ {
.membase = (void *)VOYAGER_UART_BASE, .membase = (void *)VOYAGER_UART_BASE,
...@@ -70,12 +78,6 @@ static int __init rts7751r2d_devices_setup(void) ...@@ -70,12 +78,6 @@ static int __init rts7751r2d_devices_setup(void)
return platform_add_devices(rts7751r2d_devices, return platform_add_devices(rts7751r2d_devices,
ARRAY_SIZE(rts7751r2d_devices)); ARRAY_SIZE(rts7751r2d_devices));
} }
__initcall(rts7751r2d_devices_setup);
const char *get_system_type(void)
{
return "RTS7751R2D";
}
static void rts7751r2d_power_off(void) static void rts7751r2d_power_off(void)
{ {
...@@ -85,12 +87,56 @@ static void rts7751r2d_power_off(void) ...@@ -85,12 +87,56 @@ static void rts7751r2d_power_off(void)
/* /*
* Initialize the board * Initialize the board
*/ */
void __init platform_setup(void) static void __init rts7751r2d_setup(char **cmdline_p)
{ {
printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n"); device_initcall(rts7751r2d_devices_setup);
ctrl_outw(0x0000, PA_OUTPORT); ctrl_outw(0x0000, PA_OUTPORT);
pm_power_off = rts7751r2d_power_off; pm_power_off = rts7751r2d_power_off;
voyagergx_serial_init(); voyagergx_serial_init();
printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
} }
/*
* The Machine Vector
*/
struct sh_machine_vector mv_rts7751r2d __initmv = {
.mv_name = "RTS7751R2D",
.mv_setup = rts7751r2d_setup,
.mv_nr_irqs = 72,
.mv_inb = rts7751r2d_inb,
.mv_inw = rts7751r2d_inw,
.mv_inl = rts7751r2d_inl,
.mv_outb = rts7751r2d_outb,
.mv_outw = rts7751r2d_outw,
.mv_outl = rts7751r2d_outl,
.mv_inb_p = rts7751r2d_inb_p,
.mv_inw_p = rts7751r2d_inw,
.mv_inl_p = rts7751r2d_inl,
.mv_outb_p = rts7751r2d_outb_p,
.mv_outw_p = rts7751r2d_outw,
.mv_outl_p = rts7751r2d_outl,
.mv_insb = rts7751r2d_insb,
.mv_insw = rts7751r2d_insw,
.mv_insl = rts7751r2d_insl,
.mv_outsb = rts7751r2d_outsb,
.mv_outsw = rts7751r2d_outsw,
.mv_outsl = rts7751r2d_outsl,
.mv_init_irq = init_rts7751r2d_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_rts7751r2d,
#endif
.mv_irq_demux = rts7751r2d_irq_demux,
#ifdef CONFIG_USB_SM501
.mv_consistent_alloc = voyagergx_consistent_alloc,
.mv_consistent_free = voyagergx_consistent_free,
#endif
};
ALIAS_MV(rts7751r2d)
arch/sh/boards/renesas/systemh/setup.c
View file @ 2c7834a6
...@@ -20,20 +20,16 @@ ...@@ -20,20 +20,16 @@
extern void make_systemh_irq(unsigned int irq); extern void make_systemh_irq(unsigned int irq);
const char *get_system_type(void)
{
return "7751 SystemH";
}
/* /*
* Initialize IRQ setting * Initialize IRQ setting
*/ */
void __init init_7751systemh_IRQ(void) static void __init sh7751systemh_init_irq(void)
{ {
make_systemh_irq(0xb); /* Ethernet interrupt */ make_systemh_irq(0xb); /* Ethernet interrupt */
} }
struct sh_machine_vector mv_7751systemh __initmv = { struct sh_machine_vector mv_7751systemh __initmv = {
.mv_name = "7751 SystemH",
.mv_nr_irqs = 72, .mv_nr_irqs = 72,
.mv_inb = sh7751systemh_inb, .mv_inb = sh7751systemh_inb,
...@@ -57,12 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = { ...@@ -57,12 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = {
.mv_outsw = sh7751systemh_outsw, .mv_outsw = sh7751systemh_outsw,
.mv_outsl = sh7751systemh_outsl, .mv_outsl = sh7751systemh_outsl,
.mv_init_irq = init_7751systemh_IRQ, .mv_init_irq = sh7751system_init_irq,
}; };
ALIAS_MV(7751systemh) ALIAS_MV(7751systemh)
int __init platform_setup(void)
{
return 0;
}
arch/sh/boards/saturn/setup.c
View file @ 2c7834a6
...@@ -9,22 +9,17 @@ ...@@ -9,22 +9,17 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/mach/io.h> #include <asm/mach/io.h>
extern int saturn_irq_demux(int irq_nr); extern int saturn_irq_demux(int irq_nr);
const char *get_system_type(void)
{
return "Sega Saturn";
}
/* /*
* The Machine Vector * The Machine Vector
*/ */
struct sh_machine_vector mv_saturn __initmv = { struct sh_machine_vector mv_saturn __initmv = {
.mv_name = "Sega Saturn",
.mv_nr_irqs = 80, /* Fix this later */ .mv_nr_irqs = 80, /* Fix this later */
.mv_isa_port2addr = saturn_isa_port2addr, .mv_isa_port2addr = saturn_isa_port2addr,
...@@ -33,11 +28,4 @@ struct sh_machine_vector mv_saturn __initmv = { ...@@ -33,11 +28,4 @@ struct sh_machine_vector mv_saturn __initmv = {
.mv_ioremap = saturn_ioremap, .mv_ioremap = saturn_ioremap,
.mv_iounmap = saturn_iounmap, .mv_iounmap = saturn_iounmap,
}; };
ALIAS_MV(saturn) ALIAS_MV(saturn)
int __init platform_setup(void)
{
return 0;
}
arch/sh/boards/se/7300/setup.c
View file @ 2c7834a6
...@@ -14,17 +14,11 @@ ...@@ -14,17 +14,11 @@
void heartbeat_7300se(void); void heartbeat_7300se(void);
void init_7300se_IRQ(void); void init_7300se_IRQ(void);
const char *
get_system_type(void)
{
return "SolutionEngine 7300";
}
/* /*
* The Machine Vector * The Machine Vector
*/ */
struct sh_machine_vector mv_7300se __initmv = { struct sh_machine_vector mv_7300se __initmv = {
.mv_name = "SolutionEngine 7300",
.mv_nr_irqs = 109, .mv_nr_irqs = 109,
.mv_inb = sh7300se_inb, .mv_inb = sh7300se_inb,
.mv_inw = sh7300se_inw, .mv_inw = sh7300se_inw,
...@@ -52,13 +46,4 @@ struct sh_machine_vector mv_7300se __initmv = { ...@@ -52,13 +46,4 @@ struct sh_machine_vector mv_7300se __initmv = {
.mv_heartbeat = heartbeat_7300se, .mv_heartbeat = heartbeat_7300se,
#endif #endif
}; };
ALIAS_MV(7300se) ALIAS_MV(7300se)
/*
* Initialize the board
*/
void __init
platform_setup(void)
{
}
arch/sh/boards/se/73180/setup.c
View file @ 2c7834a6
...@@ -17,17 +17,11 @@ ...@@ -17,17 +17,11 @@
void heartbeat_73180se(void); void heartbeat_73180se(void);
void init_73180se_IRQ(void); void init_73180se_IRQ(void);
const char *
get_system_type(void)
{
return "SolutionEngine 73180";
}
/* /*
* The Machine Vector * The Machine Vector
*/ */
struct sh_machine_vector mv_73180se __initmv = { struct sh_machine_vector mv_73180se __initmv = {
.mv_name = "SolutionEngine 73180",
.mv_nr_irqs = 108, .mv_nr_irqs = 108,
.mv_inb = sh73180se_inb, .mv_inb = sh73180se_inb,
.mv_inw = sh73180se_inw, .mv_inw = sh73180se_inw,
...@@ -56,13 +50,4 @@ struct sh_machine_vector mv_73180se __initmv = { ...@@ -56,13 +50,4 @@ struct sh_machine_vector mv_73180se __initmv = {
.mv_heartbeat = heartbeat_73180se, .mv_heartbeat = heartbeat_73180se,
#endif #endif
}; };
ALIAS_MV(73180se) ALIAS_MV(73180se)
/*
* Initialize the board
*/
void __init
platform_setup(void)
{
}
arch/sh/boards/se/770x/Makefile
View file @ 2c7834a6
...@@ -2,6 +2,5 @@ ...@@ -2,6 +2,5 @@
# Makefile for the 770x SolutionEngine specific parts of the kernel # 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 obj-$(CONFIG_HEARTBEAT) += led.o
arch/sh/boards/se/770x/mach.c deleted 100644 → 0
View file @ bc8fb5d0
/*
* linux/arch/sh/kernel/mach_se.c
*
* Copyright (C) 2000 Stuart Menefy (stuart.menefy@st.com)
*
* May be copied or modified under the terms of the GNU General Public
* License. See linux/COPYING for more information.
*
* Machine vector for the Hitachi SolutionEngine
*/
#include <linux/init.h>
#include <asm/machvec.h>
#include <asm/rtc.h>
#include <asm/se.h>
void heartbeat_se(void);
void init_se_IRQ(void);
/*
* The Machine Vector
*/
struct sh_machine_vector mv_se __initmv = {
#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)
arch/sh/boards/se/770x/setup.c
View file @ 2c7834a6
...@@ -7,15 +7,17 @@ ...@@ -7,15 +7,17 @@
* Hitachi SolutionEngine Support. * Hitachi SolutionEngine Support.
* *
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/se.h> #include <asm/se.h>
#include <asm/smc37c93x.h> #include <asm/smc37c93x.h>
#include <asm/machvec.h>
void heartbeat_se(void);
void init_se_IRQ(void);
/* /*
* Configure the Super I/O chip * Configure the Super I/O chip
...@@ -26,7 +28,8 @@ static void __init smsc_config(int index, int data) ...@@ -26,7 +28,8 @@ static void __init smsc_config(int index, int data)
outb_p(data, DATA_PORT); 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);
outb_p(CONFIG_ENTER, CONFIG_PORT); outb_p(CONFIG_ENTER, CONFIG_PORT);
...@@ -69,16 +72,46 @@ static void __init init_smsc(void) ...@@ -69,16 +72,46 @@ static void __init init_smsc(void)
outb_p(CONFIG_EXIT, CONFIG_PORT); 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) struct sh_machine_vector mv_se __initmv = {
{ .mv_name = "SolutionEngine",
init_smsc(); .mv_setup = smsc_setup,
/* XXX: RTC setting comes here */ #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)
arch/sh/boards/se/7751/Makefile
View file @ 2c7834a6
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# Makefile for the 7751 SolutionEngine specific parts of the kernel # Makefile for the 7751 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_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_HEARTBEAT) += led.o obj-$(CONFIG_HEARTBEAT) += led.o
arch/sh/boards/se/7751/mach.c deleted 100644 → 0
View file @ bc8fb5d0
/*
* linux/arch/sh/kernel/mach_7751se.c
*
* Minor tweak of mach_se.c file to reference 7751se-specific items.
*
* May be copied or modified under the terms of the GNU General Public
* License. See linux/COPYING for more information.
*
* Machine vector for the Hitachi 7751 SolutionEngine
*/
#include <linux/init.h>
#include <asm/machvec.h>
#include <asm/se7751.h>
void heartbeat_7751se(void);
void init_7751se_IRQ(void);
/*
* The Machine Vector
*/
struct sh_machine_vector mv_7751se __initmv = {
.mv_nr_irqs = 72,
.mv_inb = sh7751se_inb,
.mv_inw = sh7751se_inw,
.mv_inl = sh7751se_inl,
.mv_outb = sh7751se_outb,
.mv_outw = sh7751se_outw,
.mv_outl = sh7751se_outl,
.mv_inb_p = sh7751se_inb_p,
.mv_inw_p = sh7751se_inw,
.mv_inl_p = sh7751se_inl,
.mv_outb_p = sh7751se_outb_p,
.mv_outw_p = sh7751se_outw,
.mv_outl_p = sh7751se_outl,
.mv_insl = sh7751se_insl,
.mv_outsl = sh7751se_outsl,
.mv_init_irq = init_7751se_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_7751se,
#endif
};
ALIAS_MV(7751se)
arch/sh/boards/se/7751/setup.c
View file @ 2c7834a6
...@@ -15,72 +15,11 @@ ...@@ -15,72 +15,11 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/se7751.h> #include <asm/se7751.h>
#ifdef CONFIG_SH_KGDB void heartbeat_7751se(void);
#include <asm/kgdb.h> void init_7751se_IRQ(void);
#endif
/*
* Configure the Super I/O chip
*/
#if 0
/* Leftover code from regular Solution Engine, for reference. */
/* The SH7751 Solution Engine has a different SuperIO. */
static void __init smsc_config(int index, int data)
{
outb_p(index, INDEX_PORT);
outb_p(data, DATA_PORT);
}
static void __init init_smsc(void)
{
outb_p(CONFIG_ENTER, CONFIG_PORT);
outb_p(CONFIG_ENTER, CONFIG_PORT);
/* FDC */
smsc_config(CURRENT_LDN_INDEX, LDN_FDC);
smsc_config(ACTIVATE_INDEX, 0x01);
smsc_config(IRQ_SELECT_INDEX, 6); /* IRQ6 */
/* IDE1 */
smsc_config(CURRENT_LDN_INDEX, LDN_IDE1);
smsc_config(ACTIVATE_INDEX, 0x01);
smsc_config(IRQ_SELECT_INDEX, 14); /* IRQ14 */
/* AUXIO (GPIO): to use IDE1 */
smsc_config(CURRENT_LDN_INDEX, LDN_AUXIO);
smsc_config(GPIO46_INDEX, 0x00); /* nIOROP */
smsc_config(GPIO47_INDEX, 0x00); /* nIOWOP */
/* COM1 */
smsc_config(CURRENT_LDN_INDEX, LDN_COM1);
smsc_config(ACTIVATE_INDEX, 0x01);
smsc_config(IO_BASE_HI_INDEX, 0x03);
smsc_config(IO_BASE_LO_INDEX, 0xf8);
smsc_config(IRQ_SELECT_INDEX, 4); /* IRQ4 */
/* COM2 */
smsc_config(CURRENT_LDN_INDEX, LDN_COM2);
smsc_config(ACTIVATE_INDEX, 0x01);
smsc_config(IO_BASE_HI_INDEX, 0x02);
smsc_config(IO_BASE_LO_INDEX, 0xf8);
smsc_config(IRQ_SELECT_INDEX, 3); /* IRQ3 */
/* RTC */
smsc_config(CURRENT_LDN_INDEX, LDN_RTC);
smsc_config(ACTIVATE_INDEX, 0x01);
smsc_config(IRQ_SELECT_INDEX, 8); /* IRQ8 */
/* XXX: PARPORT, KBD, and MOUSE will come here... */
outb_p(CONFIG_EXIT, CONFIG_PORT);
}
#endif
const char *get_system_type(void)
{
return "7751 SolutionEngine";
}
#ifdef CONFIG_SH_KGDB #ifdef CONFIG_SH_KGDB
#include <asm/kgdb.h>
static int kgdb_uart_setup(void); static int kgdb_uart_setup(void);
static struct kgdb_sermap kgdb_uart_sermap = static struct kgdb_sermap kgdb_uart_sermap =
{ "ttyS", 0, kgdb_uart_setup, NULL }; { "ttyS", 0, kgdb_uart_setup, NULL };
...@@ -89,7 +28,7 @@ static struct kgdb_sermap kgdb_uart_sermap = ...@@ -89,7 +28,7 @@ static struct kgdb_sermap kgdb_uart_sermap =
/* /*
* Initialize the board * Initialize the board
*/ */
void __init platform_setup(void) static void __init sh7751se_setup(char **cmdline_p)
{ {
/* Call init_smsc() replacement to set up SuperIO. */ /* Call init_smsc() replacement to set up SuperIO. */
/* XXX: RTC setting comes here */ /* XXX: RTC setting comes here */
...@@ -223,3 +162,37 @@ static int kgdb_uart_setup(void) ...@@ -223,3 +162,37 @@ static int kgdb_uart_setup(void)
return 0; return 0;
} }
#endif /* CONFIG_SH_KGDB */ #endif /* CONFIG_SH_KGDB */
/*
* The Machine Vector
*/
struct sh_machine_vector mv_7751se __initmv = {
.mv_name = "7751 SolutionEngine",
.mv_setup = sh7751se_setup,
.mv_nr_irqs = 72,
.mv_inb = sh7751se_inb,
.mv_inw = sh7751se_inw,
.mv_inl = sh7751se_inl,
.mv_outb = sh7751se_outb,
.mv_outw = sh7751se_outw,
.mv_outl = sh7751se_outl,
.mv_inb_p = sh7751se_inb_p,
.mv_inw_p = sh7751se_inw,
.mv_inl_p = sh7751se_inl,
.mv_outb_p = sh7751se_outb_p,
.mv_outw_p = sh7751se_outw,
.mv_outl_p = sh7751se_outl,
.mv_insl = sh7751se_insl,
.mv_outsl = sh7751se_outsl,
.mv_init_irq = init_7751se_IRQ,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = heartbeat_7751se,
#endif
};
ALIAS_MV(7751se)
arch/sh/boards/sh03/setup.c
View file @ 2c7834a6
...@@ -13,12 +13,7 @@ ...@@ -13,12 +13,7 @@
#include <asm/sh03/sh03.h> #include <asm/sh03/sh03.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
const char *get_system_type(void) static void __init init_sh03_IRQ(void)
{
return "Interface (CTP/PCI-SH03)";
}
static void init_sh03_IRQ(void)
{ {
ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR); ctrl_outw(ctrl_inw(INTC_ICR) | INTC_ICR_IRLM, INTC_ICR);
...@@ -41,7 +36,17 @@ static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size) ...@@ -41,7 +36,17 @@ static void __iomem *sh03_ioport_map(unsigned long port, unsigned int size)
return (void __iomem *)(port + PCI_IO_BASE); return (void __iomem *)(port + PCI_IO_BASE);
} }
/* arch/sh/boards/sh03/rtc.c */
void sh03_time_init(void);
static void __init sh03_setup(char **cmdline_p)
{
board_time_init = sh03_time_init;
}
struct sh_machine_vector mv_sh03 __initmv = { struct sh_machine_vector mv_sh03 __initmv = {
.mv_name = "Interface (CTP/PCI-SH03)",
.mv_setup = sh03_setup,
.mv_nr_irqs = 48, .mv_nr_irqs = 48,
.mv_ioport_map = sh03_ioport_map, .mv_ioport_map = sh03_ioport_map,
.mv_init_irq = init_sh03_IRQ, .mv_init_irq = init_sh03_IRQ,
...@@ -51,12 +56,3 @@ struct sh_machine_vector mv_sh03 __initmv = { ...@@ -51,12 +56,3 @@ struct sh_machine_vector mv_sh03 __initmv = {
#endif #endif
}; };
ALIAS_MV(sh03) ALIAS_MV(sh03)
/* arch/sh/boards/sh03/rtc.c */
void sh03_time_init(void);
int __init platform_setup(void)
{
board_time_init = sh03_time_init;
return 0;
}
arch/sh/boards/shmin/setup.c
View file @ 2c7834a6
...@@ -14,21 +14,12 @@ ...@@ -14,21 +14,12 @@
#define PFC_PHCR 0xa400010e #define PFC_PHCR 0xa400010e
const char *get_system_type(void)
{
return "SHMIN";
}
static void __init init_shmin_irq(void) static void __init init_shmin_irq(void)
{ {
ctrl_outw(0x2a00, PFC_PHCR); // IRQ0-3=IRQ ctrl_outw(0x2a00, PFC_PHCR); // IRQ0-3=IRQ
ctrl_outw(0x0aaa, INTC_ICR1); // IRQ0-3=IRQ-mode,Low-active. ctrl_outw(0x0aaa, INTC_ICR1); // IRQ0-3=IRQ-mode,Low-active.
} }
void __init platform_setup(void)
{
}
static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size) static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
{ {
static int dummy; static int dummy;
...@@ -43,6 +34,7 @@ static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size) ...@@ -43,6 +34,7 @@ static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
} }
struct sh_machine_vector mv_shmin __initmv = { struct sh_machine_vector mv_shmin __initmv = {
.mv_name = "SHMIN",
.mv_init_irq = init_shmin_irq, .mv_init_irq = init_shmin_irq,
.mv_ioport_map = shmin_ioport_map, .mv_ioport_map = shmin_ioport_map,
}; };
......
arch/sh/boards/snapgear/setup.c
View file @ 2c7834a6
...@@ -81,16 +81,20 @@ static void __init init_snapgear_IRQ(void) ...@@ -81,16 +81,20 @@ static void __init init_snapgear_IRQ(void)
make_ipr_irq(IRL3_IRQ, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY); make_ipr_irq(IRL3_IRQ, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY);
} }
const char *get_system_type(void) /*
* Initialize the board
*/
static void __init snapgear_setup(char **cmdline_p)
{ {
return "SnapGear SecureEdge5410"; board_time_init = secureedge5410_rtc_init;
} }
/* /*
* The Machine Vector * The Machine Vector
*/ */
struct sh_machine_vector mv_snapgear __initmv = { struct sh_machine_vector mv_snapgear __initmv = {
.mv_name = "SnapGear SecureEdge5410",
.mv_setup = snapgear_setup,
.mv_nr_irqs = 72, .mv_nr_irqs = 72,
.mv_inb = snapgear_inb, .mv_inb = snapgear_inb,
...@@ -110,15 +114,3 @@ struct sh_machine_vector mv_snapgear __initmv = { ...@@ -110,15 +114,3 @@ struct sh_machine_vector mv_snapgear __initmv = {
.mv_init_irq = init_snapgear_IRQ, .mv_init_irq = init_snapgear_IRQ,
}; };
ALIAS_MV(snapgear) ALIAS_MV(snapgear)
/*
* Initialize the board
*/
int __init platform_setup(void)
{
board_time_init = secureedge5410_rtc_init;
return 0;
}
arch/sh/boards/superh/microdev/setup.c
View file @ 2c7834a6
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
* May be copied or modified under the terms of the GNU General Public * May be copied or modified under the terms of the GNU General Public
* License. See linux/COPYING for more information. * License. See linux/COPYING for more information.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -21,41 +20,6 @@ ...@@ -21,41 +20,6 @@
extern void microdev_heartbeat(void); extern void microdev_heartbeat(void);
/*
* The Machine Vector
*/
struct sh_machine_vector mv_sh4202_microdev __initmv = {
.mv_nr_irqs = 72, /* QQQ need to check this - use the MACRO */
.mv_inb = microdev_inb,
.mv_inw = microdev_inw,
.mv_inl = microdev_inl,
.mv_outb = microdev_outb,
.mv_outw = microdev_outw,
.mv_outl = microdev_outl,
.mv_inb_p = microdev_inb_p,
.mv_inw_p = microdev_inw_p,
.mv_inl_p = microdev_inl_p,
.mv_outb_p = microdev_outb_p,
.mv_outw_p = microdev_outw_p,
.mv_outl_p = microdev_outl_p,
.mv_insb = microdev_insb,
.mv_insw = microdev_insw,
.mv_insl = microdev_insl,
.mv_outsb = microdev_outsb,
.mv_outsw = microdev_outsw,
.mv_outsl = microdev_outsl,
.mv_init_irq = init_microdev_irq,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = microdev_heartbeat,
#endif
};
ALIAS_MV(sh4202_microdev)
/****************************************************************************/ /****************************************************************************/
...@@ -113,11 +77,6 @@ ALIAS_MV(sh4202_microdev) ...@@ -113,11 +77,6 @@ ALIAS_MV(sh4202_microdev)
/* assume a Keyboard Controller is present */ /* assume a Keyboard Controller is present */
int microdev_kbd_controller_present = 1; int microdev_kbd_controller_present = 1;
const char *get_system_type(void)
{
return "SH4-202 MicroDev";
}
static struct resource smc91x_resources[] = { static struct resource smc91x_resources[] = {
[0] = { [0] = {
.start = 0x300, .start = 0x300,
...@@ -291,23 +250,7 @@ static int __init microdev_devices_setup(void) ...@@ -291,23 +250,7 @@ static int __init microdev_devices_setup(void)
return platform_add_devices(microdev_devices, ARRAY_SIZE(microdev_devices)); return platform_add_devices(microdev_devices, ARRAY_SIZE(microdev_devices));
} }
__initcall(microdev_devices_setup); /*
void __init platform_setup(void)
{
int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);
const int fpgaRevision = *fpgaRevisionRegister;
int * const CacheControlRegister = (int*)CCR;
printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n",
get_system_type(), fpgaRevision, *CacheControlRegister);
}
/****************************************************************************/
/*
* Setup for the SMSC FDC37C93xAPM * Setup for the SMSC FDC37C93xAPM
*/ */
static int __init smsc_superio_setup(void) static int __init smsc_superio_setup(void)
...@@ -412,8 +355,52 @@ static int __init smsc_superio_setup(void) ...@@ -412,8 +355,52 @@ static int __init smsc_superio_setup(void)
return 0; return 0;
} }
static void __init microdev_setup(char **cmdline_p)
{
int * const fpgaRevisionRegister = (int*)(MICRODEV_FPGA_GP_BASE + 0x8ul);
const int fpgaRevision = *fpgaRevisionRegister;
int * const CacheControlRegister = (int*)CCR;
device_initcall(microdev_devices_setup);
device_initcall(smsc_superio_setup);
printk("SuperH %s board (FPGA rev: 0x%0x, CCR: 0x%0x)\n",
get_system_type(), fpgaRevision, *CacheControlRegister);
}
/* This is grotty, but, because kernel is always referenced on the link line /*
* before any devices, this is safe. * The Machine Vector
*/ */
__initcall(smsc_superio_setup); struct sh_machine_vector mv_sh4202_microdev __initmv = {
.mv_name = "SH4-202 MicroDev",
.mv_setup = microdev_setup,
.mv_nr_irqs = 72, /* QQQ need to check this - use the MACRO */
.mv_inb = microdev_inb,
.mv_inw = microdev_inw,
.mv_inl = microdev_inl,
.mv_outb = microdev_outb,
.mv_outw = microdev_outw,
.mv_outl = microdev_outl,
.mv_inb_p = microdev_inb_p,
.mv_inw_p = microdev_inw_p,
.mv_inl_p = microdev_inl_p,
.mv_outb_p = microdev_outb_p,
.mv_outw_p = microdev_outw_p,
.mv_outl_p = microdev_outl_p,
.mv_insb = microdev_insb,
.mv_insw = microdev_insw,
.mv_insl = microdev_insl,
.mv_outsb = microdev_outsb,
.mv_outsw = microdev_outsw,
.mv_outsl = microdev_outsl,
.mv_init_irq = init_microdev_irq,
#ifdef CONFIG_HEARTBEAT
.mv_heartbeat = microdev_heartbeat,
#endif
};
ALIAS_MV(sh4202_microdev)
arch/sh/boards/titan/setup.c
View file @ 2c7834a6
...@@ -20,19 +20,8 @@ static void __init init_titan_irq(void) ...@@ -20,19 +20,8 @@ static void __init init_titan_irq(void)
make_ipr_irq( TITAN_IRQ_USB, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY); /* PCIRQ3 */ make_ipr_irq( TITAN_IRQ_USB, IRL3_IPR_ADDR, IRL3_IPR_POS, IRL3_PRIORITY); /* PCIRQ3 */
} }
const char *get_system_type(void)
{
return "Titan";
}
int __init platform_setup(void)
{
printk("%s Platform Setup\n", get_system_type());
return 0;
}
struct sh_machine_vector mv_titan __initmv = { struct sh_machine_vector mv_titan __initmv = {
.mv_nr_irqs = NR_IRQS, .mv_name = "Titan",
.mv_inb = titan_inb, .mv_inb = titan_inb,
.mv_inw = titan_inw, .mv_inw = titan_inw,
......
arch/sh/boards/unknown/setup.c
View file @ 2c7834a6
...@@ -14,19 +14,8 @@ ...@@ -14,19 +14,8 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/irq.h>
struct sh_machine_vector mv_unknown __initmv = { struct sh_machine_vector mv_unknown __initmv = {
.mv_nr_irqs = NR_IRQS, .mv_name = "Unknown",
}; };
ALIAS_MV(unknown) ALIAS_MV(unknown)
const char *get_system_type(void)
{
return "Unknown";
}
void __init platform_setup(void)
{
}
arch/sh/kernel/setup.c
View file @ 2c7834a6
...@@ -43,27 +43,14 @@ extern void * __rd_start, * __rd_end; ...@@ -43,27 +43,14 @@ extern void * __rd_start, * __rd_end;
* The bigger value means no problem. * The bigger value means no problem.
*/ */
struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, }; struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };
#ifdef CONFIG_VT
struct screen_info screen_info; struct screen_info screen_info;
#endif
#if defined(CONFIG_SH_UNKNOWN) #if defined(CONFIG_SH_UNKNOWN)
struct sh_machine_vector sh_mv; struct sh_machine_vector sh_mv;
#endif #endif
/* We need this to satisfy some external references. */
struct screen_info screen_info = {
0, 25, /* orig-x, orig-y */
0, /* unused */
0, /* orig-video-page */
0, /* orig-video-mode */
80, /* orig-video-cols */
0,0,0, /* ega_ax, ega_bx, ega_cx */
25, /* orig-video-lines */
0, /* orig-video-isVGA */
16 /* orig-video-points */
};
extern void platform_setup(void);
extern char *get_system_type(void);
extern int root_mountflags; extern int root_mountflags;
#define MV_NAME_SIZE 32 #define MV_NAME_SIZE 32
...@@ -90,29 +77,8 @@ static struct sh_machine_vector* __init get_mv_byname(const char* name); ...@@ -90,29 +77,8 @@ static struct sh_machine_vector* __init get_mv_byname(const char* name);
static char command_line[COMMAND_LINE_SIZE] = { 0, }; static char command_line[COMMAND_LINE_SIZE] = { 0, };
struct resource standard_io_resources[] = { static struct resource code_resource = { .name = "Kernel code", };
{ "dma1", 0x00, 0x1f }, static struct resource data_resource = { .name = "Kernel data", };
{ "pic1", 0x20, 0x3f },
{ "timer", 0x40, 0x5f },
{ "keyboard", 0x60, 0x6f },
{ "dma page reg", 0x80, 0x8f },
{ "pic2", 0xa0, 0xbf },
{ "dma2", 0xc0, 0xdf },
{ "fpu", 0xf0, 0xff }
};
#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
/* System RAM - interrupted by the 640kB-1M hole */
#define code_resource (ram_resources[3])
#define data_resource (ram_resources[4])
static struct resource ram_resources[] = {
{ "System RAM", 0x000000, 0x09ffff, IORESOURCE_BUSY },
{ "System RAM", 0x100000, 0x100000, IORESOURCE_BUSY },
{ "Video RAM area", 0x0a0000, 0x0bffff },
{ "Kernel code", 0x100000, 0 },
{ "Kernel data", 0, 0 }
};
unsigned long memory_start, memory_end; unsigned long memory_start, memory_end;
...@@ -255,6 +221,9 @@ static int __init sh_mv_setup(char **cmdline_p) ...@@ -255,6 +221,9 @@ static int __init sh_mv_setup(char **cmdline_p)
__set_io_port_base(mv_io_base); __set_io_port_base(mv_io_base);
#endif #endif
if (!sh_mv.mv_nr_irqs)
sh_mv.mv_nr_irqs = NR_IRQS;
return 0; return 0;
} }
...@@ -263,7 +232,6 @@ void __init setup_arch(char **cmdline_p) ...@@ -263,7 +232,6 @@ void __init setup_arch(char **cmdline_p)
unsigned long bootmap_size; unsigned long bootmap_size;
unsigned long start_pfn, max_pfn, max_low_pfn; unsigned long start_pfn, max_pfn, max_low_pfn;
#ifdef CONFIG_CMDLINE_BOOL #ifdef CONFIG_CMDLINE_BOOL
strcpy(COMMAND_LINE, CONFIG_CMDLINE); strcpy(COMMAND_LINE, CONFIG_CMDLINE);
#endif #endif
...@@ -382,14 +350,14 @@ void __init setup_arch(char **cmdline_p) ...@@ -382,14 +350,14 @@ void __init setup_arch(char **cmdline_p)
#endif #endif
/* Perform the machine specific initialisation */ /* Perform the machine specific initialisation */
platform_setup(); if (likely(sh_mv.mv_setup))
sh_mv.mv_setup(cmdline_p);
paging_init(); paging_init();
} }
struct sh_machine_vector* __init get_mv_byname(const char* name) struct sh_machine_vector* __init get_mv_byname(const char* name)
{ {
extern int strcasecmp(const char *, const char *);
extern long __machvec_start, __machvec_end; extern long __machvec_start, __machvec_end;
struct sh_machine_vector *all_vecs = struct sh_machine_vector *all_vecs =
(struct sh_machine_vector *)&__machvec_start; (struct sh_machine_vector *)&__machvec_start;
...@@ -467,7 +435,8 @@ static void show_cpuflags(struct seq_file *m) ...@@ -467,7 +435,8 @@ static void show_cpuflags(struct seq_file *m)
seq_printf(m, "\n"); seq_printf(m, "\n");
} }
static void show_cacheinfo(struct seq_file *m, const char *type, struct cache_info info) static void show_cacheinfo(struct seq_file *m, const char *type,
struct cache_info info)
{ {
unsigned int cache_size; unsigned int cache_size;
...@@ -624,4 +593,3 @@ static int __init kgdb_parse_options(char *options) ...@@ -624,4 +593,3 @@ static int __init kgdb_parse_options(char *options)
} }
__setup("kgdb=", kgdb_parse_options); __setup("kgdb=", kgdb_parse_options);
#endif /* CONFIG_SH_KGDB */ #endif /* CONFIG_SH_KGDB */
include/asm-sh/machvec.h
View file @ 2c7834a6
...@@ -8,17 +8,18 @@ ...@@ -8,17 +8,18 @@
*/ */
#ifndef _ASM_SH_MACHVEC_H #ifndef _ASM_SH_MACHVEC_H
#define _ASM_SH_MACHVEC_H 1 #define _ASM_SH_MACHVEC_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/machtypes.h> #include <asm/machtypes.h>
#include <asm/machvec_init.h> #include <asm/machvec_init.h>
struct device; struct device;
struct sh_machine_vector { struct sh_machine_vector {
void (*mv_setup)(char **cmdline_p);
const char *mv_name;
int mv_nr_irqs; int mv_nr_irqs;
u8 (*mv_inb)(unsigned long); u8 (*mv_inb)(unsigned long);
...@@ -65,4 +66,6 @@ struct sh_machine_vector { ...@@ -65,4 +66,6 @@ struct sh_machine_vector {
extern struct sh_machine_vector sh_mv; extern struct sh_machine_vector sh_mv;
#define get_system_type() sh_mv.mv_name
#endif /* _ASM_SH_MACHVEC_H */ #endif /* _ASM_SH_MACHVEC_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment