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: cadence_qspi: Add quad write support
[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..8d6d86d2b0a1728aaf832b321b9e2352b4d72b5f 100644
(file)
--- a/
drivers/spi/mpc8xxx_spi.c
+++ b/
drivers/spi/mpc8xxx_spi.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
* With help from the common/soft_spi and arch/powerpc/cpu/mpc8260 drivers
/*
* Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
* With help from the common/soft_spi and arch/powerpc/cpu/mpc8260 drivers
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-55,7
+54,7
@@
void spi_init(void)
* some registers
*/
spi->mode = SPI_MODE_REV | SPI_MODE_MS | SPI_MODE_EN;
* some registers
*/
spi->mode = SPI_MODE_REV | SPI_MODE_MS | SPI_MODE_EN;
- spi->mode = (spi->mode & 0xfff0ffff) |
(1 <<
16); /* Use SYSCLK / 8
+ spi->mode = (spi->mode & 0xfff0ffff) |
BIT(
16); /* Use SYSCLK / 8
(16.67MHz typ.) */
spi->event = 0xffffffff; /* Clear all SPI events */
spi->mask = 0x00000000; /* Mask all SPI interrupts */
(16.67MHz typ.) */
spi->event = 0xffffffff; /* Clear all SPI events */
spi->mask = 0x00000000; /* Mask all SPI interrupts */
@@
-77,7
+76,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
+109,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 */