projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Drop linux/delay.h from common header
[oweals/u-boot.git]
/
drivers
/
spi
/
rk_spi.c
diff --git
a/drivers/spi/rk_spi.c
b/drivers/spi/rk_spi.c
index a68553b75bf1d58226cc3669d1553d15a83402ae..833cb04922ebb97e6d2dc74549c28ac23370de74 100644
(file)
--- a/
drivers/spi/rk_spi.c
+++ b/
drivers/spi/rk_spi.c
@@
-15,7
+15,10
@@
#include <dm.h>
#include <dt-structs.h>
#include <errno.h>
#include <dm.h>
#include <dt-structs.h>
#include <errno.h>
+#include <log.h>
#include <spi.h>
#include <spi.h>
+#include <time.h>
+#include <linux/delay.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/arch-rockchip/clock.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/arch-rockchip/clock.h>
@@
-26,6
+29,12
@@
/* Change to 1 to output registers at the start of each transaction */
#define DEBUG_RK_SPI 0
/* Change to 1 to output registers at the start of each transaction */
#define DEBUG_RK_SPI 0
+/*
+ * ctrlr1 is 16-bits, so we should support lengths of 0xffff + 1. However,
+ * the controller seems to hang when given 0x10000, so stick with this for now.
+ */
+#define ROCKCHIP_SPI_MAX_TRANLEN 0xffff
+
struct rockchip_spi_params {
/* RXFIFO overruns and TXFIFO underruns stop the master clock */
bool master_manages_fifo;
struct rockchip_spi_params {
/* RXFIFO overruns and TXFIFO underruns stop the master clock */
bool master_manages_fifo;
@@
-366,7
+375,7
@@
static inline int rockchip_spi_16bit_reader(struct udevice *dev,
* represented in CTRLR1.
*/
if (data && data->master_manages_fifo)
* represented in CTRLR1.
*/
if (data && data->master_manages_fifo)
- max_chunk_size =
0x10000
;
+ max_chunk_size =
ROCKCHIP_SPI_MAX_TRANLEN
;
// rockchip_spi_configure(dev, mode, size)
rkspi_enable_chip(regs, false);
// rockchip_spi_configure(dev, mode, size)
rkspi_enable_chip(regs, false);
@@
-450,7
+459,7
@@
static int rockchip_spi_xfer(struct udevice *dev, unsigned int bitlen,
/* This is the original 8bit reader/writer code */
while (len > 0) {
/* This is the original 8bit reader/writer code */
while (len > 0) {
- int todo = min(len,
0x10000
);
+ int todo = min(len,
ROCKCHIP_SPI_MAX_TRANLEN
);
rkspi_enable_chip(regs, false);
writel(todo - 1, ®s->ctrlr1);
rkspi_enable_chip(regs, false);
writel(todo - 1, ®s->ctrlr1);