diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/net/s2io-regs.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/net/s2io-regs.h')
| -rw-r--r-- | drivers/net/s2io-regs.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h index 7cefe5507b9e..00179bc3437f 100644 --- a/drivers/net/s2io-regs.h +++ b/drivers/net/s2io-regs.h | |||
| @@ -814,6 +814,17 @@ typedef struct _XENA_dev_config { | |||
| 814 | u64 rxgxs_ber_0; /* CHANGED */ | 814 | u64 rxgxs_ber_0; /* CHANGED */ |
| 815 | u64 rxgxs_ber_1; /* CHANGED */ | 815 | u64 rxgxs_ber_1; /* CHANGED */ |
| 816 | 816 | ||
| 817 | u64 spi_control; | ||
| 818 | #define SPI_CONTROL_KEY(key) vBIT(key,0,4) | ||
| 819 | #define SPI_CONTROL_BYTECNT(cnt) vBIT(cnt,29,3) | ||
| 820 | #define SPI_CONTROL_CMD(cmd) vBIT(cmd,32,8) | ||
| 821 | #define SPI_CONTROL_ADDR(addr) vBIT(addr,40,24) | ||
| 822 | #define SPI_CONTROL_SEL1 BIT(4) | ||
| 823 | #define SPI_CONTROL_REQ BIT(7) | ||
| 824 | #define SPI_CONTROL_NACK BIT(5) | ||
| 825 | #define SPI_CONTROL_DONE BIT(6) | ||
| 826 | u64 spi_data; | ||
| 827 | #define SPI_DATA_WRITE(data,len) vBIT(data,0,len) | ||
| 817 | } XENA_dev_config_t; | 828 | } XENA_dev_config_t; |
| 818 | 829 | ||
| 819 | #define XENA_REG_SPACE sizeof(XENA_dev_config_t) | 830 | #define XENA_REG_SPACE sizeof(XENA_dev_config_t) |