[U-Boot-Users] [PATCH] mpc83xx: Correct the struct spi8xxx in mpc8xxx_spi.h

[Kim Phillips]

On Thu, 17 Jan 2008 22:09:24 -0500
Ben Warren <biggerbadderben at gmail.com> wrote:

> Dave Liu wrote:
> > The commit 04a9e1180ac76a7bacc15a6fcd95ad839d65bddb
> > cause the 83xx immap broken, so the DMA and PCI will
> > be failed.
> >
> > The patch fix the struct spi8xxx.
> >
> > Signed-off-by: Dave Liu <daveliu at freescale.com>
<snip>
> BTW - this one isn't used anywhere.  We should probably remove it from 
> this file.  Not urgent, though.

I've applied Dave's patch (thanks Dave), and amended it to rm struct
83xxspi and pushed my tree.

Hopefully WD hasn't pulled it yet.  In any case, we'll see what happens.

here's the resulting diff:

diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h
index c16a098..5b21539 100644
--- a/include/asm-ppc/immap_83xx.h
+++ b/include/asm-ppc/immap_83xx.h
@@ -385,20 +385,6 @@ typedef struct lbus83xx {
 } 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
  */
 typedef struct dma83xx {
diff --git a/include/asm-ppc/mpc8xxx_spi.h b/include/asm-ppc/mpc8xxx_spi.h
index 053d11e..48b15e4 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

Kim