Merge commit 'v2.6.35-rc6' into spi/test
This commit is contained in:
@@ -66,28 +66,6 @@ struct mpc8xxx_spi_reg {
|
||||
__be32 receive;
|
||||
};
|
||||
|
||||
/* SPI Parameter RAM */
|
||||
struct spi_pram {
|
||||
__be16 rbase; /* Rx Buffer descriptor base address */
|
||||
__be16 tbase; /* Tx Buffer descriptor base address */
|
||||
u8 rfcr; /* Rx function code */
|
||||
u8 tfcr; /* Tx function code */
|
||||
__be16 mrblr; /* Max receive buffer length */
|
||||
__be32 rstate; /* Internal */
|
||||
__be32 rdp; /* Internal */
|
||||
__be16 rbptr; /* Internal */
|
||||
__be16 rbc; /* Internal */
|
||||
__be32 rxtmp; /* Internal */
|
||||
__be32 tstate; /* Internal */
|
||||
__be32 tdp; /* Internal */
|
||||
__be16 tbptr; /* Internal */
|
||||
__be16 tbc; /* Internal */
|
||||
__be32 txtmp; /* Internal */
|
||||
__be32 res; /* Tx temp. */
|
||||
__be16 rpbase; /* Relocation pointer (CPM1 only) */
|
||||
__be16 res1; /* Reserved */
|
||||
};
|
||||
|
||||
/* SPI Controller mode register definitions */
|
||||
#define SPMODE_LOOP (1 << 30)
|
||||
#define SPMODE_CI_INACTIVEHIGH (1 << 29)
|
||||
|
Reference in New Issue
Block a user