diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-02-15 18:20:52 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-02-15 18:20:52 +0900 |
| commit | 9c57548f17806ffd8e4dc4f7973ce78bbfbc2079 (patch) | |
| tree | b42b80e40e1f84fcea23ceb76fa697022df6ed9b /include/asm-sh | |
| parent | e65fa9f59e9230b72ac298d445b4a18a4eefeb34 (diff) | |
| download | kernel-crypto-9c57548f17806ffd8e4dc4f7973ce78bbfbc2079.tar.gz kernel-crypto-9c57548f17806ffd8e4dc4f7973ce78bbfbc2079.tar.xz kernel-crypto-9c57548f17806ffd8e4dc4f7973ce78bbfbc2079.zip | |
sh: rts7751r2d board updates.
This tidies up some of the rts7751r2d mess and gets it booting
again. Update the defconfig, too.
Signed-off-by: Masayuki Hosokawa <hosokawa@ace-jp.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh')
| -rw-r--r-- | include/asm-sh/rts7751r2d.h | 4 | ||||
| -rw-r--r-- | include/asm-sh/serial.h | 5 | ||||
| -rw-r--r-- | include/asm-sh/voyagergx.h | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/asm-sh/rts7751r2d.h b/include/asm-sh/rts7751r2d.h index 796b8fcb81a..10565ac7966 100644 --- a/include/asm-sh/rts7751r2d.h +++ b/include/asm-sh/rts7751r2d.h @@ -68,6 +68,10 @@ #define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */ #define IRQ_EXTENTION 11 /* EXTn IRQ */ +/* arch/sh/boards/renesas/rts7751r2d/irq.c */ +void init_rts7751r2d_IRQ(void); +int rts7751r2d_irq_demux(int); + #define __IO_PREFIX rts7751r2d #include <asm/io_generic.h> diff --git a/include/asm-sh/serial.h b/include/asm-sh/serial.h index 4ac0e781081..21f6d330f18 100644 --- a/include/asm-sh/serial.h +++ b/include/asm-sh/serial.h @@ -29,10 +29,7 @@ #else -#define SERIAL_PORT_DFNS \ - /* UART CLK PORT IRQ FLAGS */ \ - { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ - { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS } /* ttyS1 */ +#define SERIAL_PORT_DFNS #endif diff --git a/include/asm-sh/voyagergx.h b/include/asm-sh/voyagergx.h index 99b0807d1c9..64c936b2271 100644 --- a/include/asm-sh/voyagergx.h +++ b/include/asm-sh/voyagergx.h @@ -308,6 +308,9 @@ #define AC97C_READ (1 << 19) #define AC97C_WD_BIT (1 << 2) #define AC97C_INDEX_MASK 0x7f -/* -------------------------------------------------------------------- */ + +/* arch/sh/cchips/voyagergx/consistent.c */ +void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); +int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); #endif /* _VOYAGER_GX_REG_H */ |