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
/
exynos_spi.c
diff --git
a/drivers/spi/exynos_spi.c
b/drivers/spi/exynos_spi.c
index a46d8c187668cff8560eea31c7189c7dfa3b4161..44948c37364d27d42138fd824145e426ad56acdf 100644
(file)
--- a/
drivers/spi/exynos_spi.c
+++ b/
drivers/spi/exynos_spi.c
@@
-16,7
+16,7
@@
#include <asm/arch/cpu.h>
#include <asm/arch/gpio.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/cpu.h>
#include <asm/arch/gpio.h>
#include <asm/arch/pinmux.h>
-#include <asm/arch
-exynos
/spi.h>
+#include <asm/arch/spi.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
@@
-190,9
+190,9
@@
static int spi_rx_tx(struct exynos_spi_priv *priv, int todo,
spi_request_bytes(regs, toread, step);
}
if (priv->skip_preamble && get_timer(start) > 100) {
spi_request_bytes(regs, toread, step);
}
if (priv->skip_preamble && get_timer(start) > 100) {
-
printf
("SPI timeout: in_bytes=%d, out_bytes=%d, ",
-
in_bytes, out_bytes);
- return -
1
;
+
debug
("SPI timeout: in_bytes=%d, out_bytes=%d, ",
+ in_bytes, out_bytes);
+ return -
ETIMEDOUT
;
}
}
}
}
@@
-255,7
+255,7
@@
static int exynos_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 exynos_spi *)
fdtdec_get_addr(blob, node, "reg"
);
+ plat->regs = (struct exynos_spi *)
dev_get_addr(bus
);
plat->periph_id = pinmux_decode_periph_id(blob, node);
if (plat->periph_id == PERIPH_ID_NONE) {
plat->periph_id = pinmux_decode_periph_id(blob, node);
if (plat->periph_id == PERIPH_ID_NONE) {
@@
-296,8
+296,9
@@
static int exynos_spi_probe(struct udevice *bus)
return 0;
}
return 0;
}
-static int exynos_spi_claim_bus(struct udevice *
bus
)
+static int exynos_spi_claim_bus(struct udevice *
dev
)
{
{
+ struct udevice *bus = dev->parent;
struct exynos_spi_priv *priv = dev_get_priv(bus);
exynos_pinmux_config(priv->periph_id, PINMUX_FLAG_NONE);
struct exynos_spi_priv *priv = dev_get_priv(bus);
exynos_pinmux_config(priv->periph_id, PINMUX_FLAG_NONE);
@@
-308,8
+309,9
@@
static int exynos_spi_claim_bus(struct udevice *bus)
return 0;
}
return 0;
}
-static int exynos_spi_release_bus(struct udevice *
bus
)
+static int exynos_spi_release_bus(struct udevice *
dev
)
{
{
+ struct udevice *bus = dev->parent;
struct exynos_spi_priv *priv = dev_get_priv(bus);
spi_flush_fifo(priv->regs);
struct exynos_spi_priv *priv = dev_get_priv(bus);
spi_flush_fifo(priv->regs);