projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-dm
[oweals/u-boot.git]
/
drivers
/
spi
/
designware_spi.c
diff --git
a/drivers/spi/designware_spi.c
b/drivers/spi/designware_spi.c
index 2624844d528566bb7ed786ae06537b4cbf69b777..86ee90f4be50f796550ed17437d68b357f0ba861 100644
(file)
--- a/
drivers/spi/designware_spi.c
+++ b/
drivers/spi/designware_spi.c
@@
-134,7
+134,7
@@
static int dw_spi_ofdata_to_platdata(struct udevice *bus)
const void *blob = gd->fdt_blob;
int node = bus->of_offset;
const void *blob = gd->fdt_blob;
int node = bus->of_offset;
- plat->regs = (struct dw_spi *)
fdtdec_get_addr(blob, node, "reg"
);
+ plat->regs = (struct dw_spi *)
dev_get_addr(bus
);
/* Use 500KHz as a suitable default */
plat->frequency = fdtdec_get_int(blob, node, "spi-max-frequency",
/* Use 500KHz as a suitable default */
plat->frequency = fdtdec_get_int(blob, node, "spi-max-frequency",
@@
-164,13
+164,13
@@
static void spi_hw_init(struct dw_spi_priv *priv)
if (!priv->fifo_len) {
u32 fifo;
if (!priv->fifo_len) {
u32 fifo;
- for (fifo =
2; fifo <=
256; fifo++) {
+ for (fifo =
1; fifo <
256; fifo++) {
dw_writew(priv, DW_SPI_TXFLTR, fifo);
if (fifo != dw_readw(priv, DW_SPI_TXFLTR))
break;
}
dw_writew(priv, DW_SPI_TXFLTR, fifo);
if (fifo != dw_readw(priv, DW_SPI_TXFLTR))
break;
}
- priv->fifo_len = (fifo ==
2) ? 0 : fifo - 1
;
+ priv->fifo_len = (fifo ==
1) ? 0 : fifo
;
dw_writew(priv, DW_SPI_TXFLTR, 0);
}
debug("%s: fifo_len=%d\n", __func__, priv->fifo_len);
dw_writew(priv, DW_SPI_TXFLTR, 0);
}
debug("%s: fifo_len=%d\n", __func__, priv->fifo_len);