git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[sfrench/cifs-2.6.git]
/
arch
/
blackfin
/
include
/
asm
/
bfin5xx_spi.h
diff --git
a/arch/blackfin/include/asm/bfin5xx_spi.h
b/arch/blackfin/include/asm/bfin5xx_spi.h
index 0292d58f9362e84e3b337c575a54b0b1ff6d9cad..aaeb4df10d578c6128aa6ef13a6ffb41b91e6a25 100644
(file)
--- a/
arch/blackfin/include/asm/bfin5xx_spi.h
+++ b/
arch/blackfin/include/asm/bfin5xx_spi.h
@@
-11,6
+11,8
@@
#ifndef _SPI_CHANNEL_H_
#define _SPI_CHANNEL_H_
#ifndef _SPI_CHANNEL_H_
#define _SPI_CHANNEL_H_
+#define MIN_SPI_BAUD_VAL 2
+
#define SPI_READ 0
#define SPI_WRITE 1
#define SPI_READ 0
#define SPI_WRITE 1
@@
-122,6
+124,9
@@
struct bfin5xx_spi_chip {
u8 bits_per_word;
u8 cs_change_per_word;
u16 cs_chg_udelay; /* Some devices require 16-bit delays */
u8 bits_per_word;
u8 cs_change_per_word;
u16 cs_chg_udelay; /* Some devices require 16-bit delays */
+ u32 cs_gpio;
+ /* Value to send if no TX value is supplied, usually 0x0 or 0xFFFF */
+ u16 idle_tx_val;
};
#endif /* _SPI_CHANNEL_H_ */
};
#endif /* _SPI_CHANNEL_H_ */