From cfe5ca77976afdbe7ecb86e39fd7505bde636ace Mon Sep 17 00:00:00 2001 From: Dave Liu Date: Fri, 18 Jan 2008 10:07:04 +0800 Subject: mpc83xx: Correct the struct spi8xxx in mpc8xxx_spi.h The commit 04a9e1180ac76a7bacc15a6fcd95ad839d65bddb cause the 83xx immap broken, so the DMA and PCI will be failed. The patch fix the struct spi8xxx and rm struct spi83xx. Signed-off-by: Dave Liu Signed-off-by: Kim Phillips --- include/asm-ppc/immap_83xx.h | 14 -------------- include/asm-ppc/mpc8xxx_spi.h | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h index c16a0981d6..5b215393ee 100644 --- a/include/asm-ppc/immap_83xx.h +++ b/include/asm-ppc/immap_83xx.h @@ -384,20 +384,6 @@ typedef struct lbus83xx { u8 res8[0xF08]; } lbus83xx_t; -/* - * Serial Peripheral Interface - */ -typedef struct spi83xx { - u32 mode; /* mode register */ - u32 event; /* event register */ - u32 mask; /* mask register */ - u32 com; /* command register */ - u8 res0[0x10]; - u32 tx; /* transmit register */ - u32 rx; /* receive register */ - u8 res1[0xFD8]; -} spi83xx_t; - /* * DMA/Messaging Unit */ diff --git a/include/asm-ppc/mpc8xxx_spi.h b/include/asm-ppc/mpc8xxx_spi.h index 053d11e53b..48b15e4f33 100644 --- a/include/asm-ppc/mpc8xxx_spi.h +++ b/include/asm-ppc/mpc8xxx_spi.h @@ -40,7 +40,7 @@ typedef struct spi8xxx { u32 com; /* command register */ u32 tx; /* transmit register */ u32 rx; /* receive register */ - u8 res1[0xC8]; /* fill up to 0x100 */ + u8 res1[0xFC8]; /* fill up to 0x1000 */ } spi8xxx_t; #endif -- cgit v1.2.1