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 branch 'master' of git://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
drivers
/
spi
/
fsl_dspi.c
diff --git
a/drivers/spi/fsl_dspi.c
b/drivers/spi/fsl_dspi.c
index 792853192ed78fc661b467d2f5c21405f97bdd47..c8dcb277f2a66244b158af6eb4e56f7df3cf8827 100644
(file)
--- a/
drivers/spi/fsl_dspi.c
+++ b/
drivers/spi/fsl_dspi.c
@@
-24,7
+24,7
@@
DECLARE_GLOBAL_DATA_PTR;
/* fsl_dspi_platdata flags */
DECLARE_GLOBAL_DATA_PTR;
/* fsl_dspi_platdata flags */
-#define DSPI_FLAG_REGMAP_ENDIAN_BIG
(1 <<
0)
+#define DSPI_FLAG_REGMAP_ENDIAN_BIG
BIT(
0)
/* idle data value */
#define DSPI_IDLE_VAL 0x0
/* idle data value */
#define DSPI_IDLE_VAL 0x0
@@
-654,7
+654,7
@@
static int fsl_dspi_ofdata_to_platdata(struct udevice *bus)
plat->num_chipselect =
fdtdec_get_int(blob, node, "num-cs", FSL_DSPI_MAX_CHIPSELECT);
plat->num_chipselect =
fdtdec_get_int(blob, node, "num-cs", FSL_DSPI_MAX_CHIPSELECT);
- addr =
fdtdec_get_addr(blob, node, "reg"
);
+ addr =
dev_get_addr(bus
);
if (addr == FDT_ADDR_T_NONE) {
debug("DSPI: Can't get base address or size\n");
return -ENOMEM;
if (addr == FDT_ADDR_T_NONE) {
debug("DSPI: Can't get base address or size\n");
return -ENOMEM;
@@
-664,8
+664,8
@@
static int fsl_dspi_ofdata_to_platdata(struct udevice *bus)
plat->speed_hz = fdtdec_get_int(blob,
node, "spi-max-frequency", FSL_DSPI_DEFAULT_SCK_FREQ);
plat->speed_hz = fdtdec_get_int(blob,
node, "spi-max-frequency", FSL_DSPI_DEFAULT_SCK_FREQ);
- debug("DSPI: regs=
0x%llx
, max-frequency=%d, endianess=%s, num-cs=%d\n",
-
(u64)
plat->regs_addr, plat->speed_hz,
+ debug("DSPI: regs=
%pa
, max-frequency=%d, endianess=%s, num-cs=%d\n",
+
&
plat->regs_addr, plat->speed_hz,
plat->flags & DSPI_FLAG_REGMAP_ENDIAN_BIG ? "be" : "le",
plat->num_chipselect);
plat->flags & DSPI_FLAG_REGMAP_ENDIAN_BIG ? "be" : "le",
plat->num_chipselect);