projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spi: davinci_spi: Move header code to driver
[oweals/u-boot.git]
/
drivers
/
spi
/
mpc8xxx_spi.c
diff --git
a/drivers/spi/mpc8xxx_spi.c
b/drivers/spi/mpc8xxx_spi.c
index bbfc259e47382e8c690289bcb445deb0beaf6977..0d59c361513319f796ac6bf82671616d07b67625 100644
(file)
--- a/
drivers/spi/mpc8xxx_spi.c
+++ b/
drivers/spi/mpc8xxx_spi.c
@@
-77,7
+77,7
@@
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
{
volatile spi8xxx_t *spi = &((immap_t *) (CONFIG_SYS_IMMR))->spi;
unsigned int tmpdout, tmpdin, event;
{
volatile spi8xxx_t *spi = &((immap_t *) (CONFIG_SYS_IMMR))->spi;
unsigned int tmpdout, tmpdin, event;
- int numBlks =
bitlen / 32 + (bitlen % 32 ? 1 : 0
);
+ int numBlks =
DIV_ROUND_UP(bitlen, 32
);
int tm, isRead = 0;
unsigned char charSize = 32;
int tm, isRead = 0;
unsigned char charSize = 32;
@@
-110,10
+110,10
@@
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
if (bitlen <= 16) {
if (bitlen <= 4)
spi->mode = (spi->mode & 0xff0fffff) |
if (bitlen <= 16) {
if (bitlen <= 4)
spi->mode = (spi->mode & 0xff0fffff) |
- (3 << 20);
+ (3 << 20);
else
spi->mode = (spi->mode & 0xff0fffff) |
else
spi->mode = (spi->mode & 0xff0fffff) |
- ((bitlen - 1) << 20);
+ ((bitlen - 1) << 20);
} else {
spi->mode = (spi->mode & 0xff0fffff);
/* Set up the next iteration if sending > 32 bits */
} else {
spi->mode = (spi->mode & 0xff0fffff);
/* Set up the next iteration if sending > 32 bits */