Commit 2257be73 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sh: Consolidate SystemH with other Renesas boards.

From: Paul Mundt <lethal@Linux-SH.ORG>

Nothing really interesting here, with the addition of several other Renesas
boards, we just move the systemh directory to the renesas one to fit in
better with the directory structure.
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6bac468e
...@@ -9,5 +9,5 @@ obj-y := setup.o irq.o io.o ...@@ -9,5 +9,5 @@ obj-y := setup.o irq.o io.o
# just abuse the hell out of kbuild, because we can.. # just abuse the hell out of kbuild, because we can..
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
pci-y := ../se/7751/pci.o pci-y := ../../se/7751/pci.o
/* /*
* linux/arch/sh/boards/systemh/io.c * linux/arch/sh/boards/systemh/io.c
* *
* Copyright (C) 2001 Ian da Silva, Jeremy Siegel * Copyright (C) 2001 Ian da Silva, Jeremy Siegel
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
/* /*
* The 7751 SystemH Engine uses the built-in PCI controller (PCIC) * The 7751 SystemH Engine uses the built-in PCI controller (PCIC)
* of the 7751 processor, and has a SuperIO accessible on its memory * of the 7751 processor, and has a SuperIO accessible on its memory
* bus. * bus.
*/ */
#define PCIIOBR (volatile long *)PCI_REG(SH7751_PCIIOBR) #define PCIIOBR (volatile long *)PCI_REG(SH7751_PCIIOBR)
#define PCIMBR (volatile long *)PCI_REG(SH7751_PCIMBR) #define PCIMBR (volatile long *)PCI_REG(SH7751_PCIMBR)
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define PCI_IOMAP(adr) (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK)) #define PCI_IOMAP(adr) (PCI_IO_AREA + (adr & ~SH7751_PCIIOBR_MASK))
#define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area #define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area
of smc lan chip*/ of smc lan chip*/
#define maybebadio(name,port) \ #define maybebadio(name,port) \
printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \ printk("bad PC-like io %s for port 0x%lx at 0x%08x\n", \
...@@ -81,7 +81,7 @@ unsigned char sh7751systemh_inb(unsigned long port) ...@@ -81,7 +81,7 @@ unsigned char sh7751systemh_inb(unsigned long port)
else if (port <= 0x3F1) else if (port <= 0x3F1)
return *(volatile unsigned char *)ETHER_IOMAP(port); return *(volatile unsigned char *)ETHER_IOMAP(port);
else else
return (*port2adr(port))&0xff; return (*port2adr(port))&0xff;
} }
unsigned char sh7751systemh_inb_p(unsigned long port) unsigned char sh7751systemh_inb_p(unsigned long port)
...@@ -95,7 +95,7 @@ unsigned char sh7751systemh_inb_p(unsigned long port) ...@@ -95,7 +95,7 @@ unsigned char sh7751systemh_inb_p(unsigned long port)
else if (port <= 0x3F1) else if (port <= 0x3F1)
v = *(volatile unsigned char *)ETHER_IOMAP(port); v = *(volatile unsigned char *)ETHER_IOMAP(port);
else else
v = (*port2adr(port))&0xff; v = (*port2adr(port))&0xff;
delay(); delay();
return v; return v;
} }
......
/* /*
* linux/arch/sh/boards/systemh/irq.c * linux/arch/sh/boards/systemh/irq.c
* *
* Copyright (C) 2000 Kazumoto Kojima * Copyright (C) 2000 Kazumoto Kojima
...@@ -45,7 +45,7 @@ static struct hw_interrupt_type systemh_irq_type = { ...@@ -45,7 +45,7 @@ static struct hw_interrupt_type systemh_irq_type = {
}; };
static unsigned int startup_systemh_irq(unsigned int irq) static unsigned int startup_systemh_irq(unsigned int irq)
{ {
enable_systemh_irq(irq); enable_systemh_irq(irq);
return 0; /* never anything pending */ return 0; /* never anything pending */
} }
......
/* /*
* linux/arch/sh/boards/systemh/setup.c * linux/arch/sh/boards/systemh/setup.c
* *
* Copyright (C) 2000 Kazumoto Kojima * Copyright (C) 2000 Kazumoto Kojima
......
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