projects
/
platform
/
kernel
/
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://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
drivers
/
spi
/
spi-uclass.c
diff --git
a/drivers/spi/spi-uclass.c
b/drivers/spi/spi-uclass.c
index
d2d091f
..
2bc289a
100644
(file)
--- a/
drivers/spi/spi-uclass.c
+++ b/
drivers/spi/spi-uclass.c
@@
-15,6
+15,8
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
+#define SPI_DEFAULT_SPEED_HZ 100000
+
static int spi_set_speed_mode(struct udevice *bus, int speed, int mode)
{
struct dm_spi_ops *ops;
static int spi_set_speed_mode(struct udevice *bus, int speed, int mode)
{
struct dm_spi_ops *ops;
@@
-58,16
+60,16
@@
int dm_spi_claim_bus(struct udevice *dev)
speed = spi->max_hz;
}
if (!speed)
speed = spi->max_hz;
}
if (!speed)
- speed =
100000
;
+ speed =
SPI_DEFAULT_SPEED_HZ
;
if (speed != slave->speed) {
int ret = spi_set_speed_mode(bus, speed, slave->mode);
if (ret)
if (speed != slave->speed) {
int ret = spi_set_speed_mode(bus, speed, slave->mode);
if (ret)
- return
ret
;
+ return
log_ret(ret)
;
slave->speed = speed;
}
slave->speed = speed;
}
- return
ops->claim_bus ? ops->claim_bus(dev) : 0
;
+ return
log_ret(ops->claim_bus ? ops->claim_bus(dev) : 0)
;
}
void dm_spi_release_bus(struct udevice *dev)
}
void dm_spi_release_bus(struct udevice *dev)
@@
-92,7
+94,7
@@
int dm_spi_xfer(struct udevice *dev, unsigned int bitlen,
int spi_claim_bus(struct spi_slave *slave)
{
int spi_claim_bus(struct spi_slave *slave)
{
- return
dm_spi_claim_bus(slave->dev
);
+ return
log_ret(dm_spi_claim_bus(slave->dev)
);
}
void spi_release_bus(struct spi_slave *slave)
}
void spi_release_bus(struct spi_slave *slave)
@@
-273,7
+275,7
@@
int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
bool created = false;
int ret;
bool created = false;
int ret;
-#if CONFIG_IS_ENABLED(OF_PLATDATA)
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
|| CONFIG_IS_ENABLED(OF_PRIOR_STAGE)
ret = uclass_first_device_err(UCLASS_SPI, &bus);
#else
ret = uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus);
ret = uclass_first_device_err(UCLASS_SPI, &bus);
#else
ret = uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus);
@@
-300,7
+302,13
@@
int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
}
plat = dev_get_parent_platdata(dev);
plat->cs = cs;
}
plat = dev_get_parent_platdata(dev);
plat->cs = cs;
- plat->max_hz = speed;
+ if (speed) {
+ plat->max_hz = speed;
+ } else {
+ printf("Warning: SPI speed fallback to %u kHz\n",
+ SPI_DEFAULT_SPEED_HZ / 1000);
+ plat->max_hz = SPI_DEFAULT_SPEED_HZ;
+ }
plat->mode = mode;
created = true;
} else if (ret) {
plat->mode = mode;
created = true;
} else if (ret) {
@@
-374,7
+382,8
@@
int spi_slave_ofdata_to_platdata(struct udevice *dev,
int value;
plat->cs = dev_read_u32_default(dev, "reg", -1);
int value;
plat->cs = dev_read_u32_default(dev, "reg", -1);
- plat->max_hz = dev_read_u32_default(dev, "spi-max-frequency", 0);
+ plat->max_hz = dev_read_u32_default(dev, "spi-max-frequency",
+ SPI_DEFAULT_SPEED_HZ);
if (dev_read_bool(dev, "spi-cpol"))
mode |= SPI_CPOL;
if (dev_read_bool(dev, "spi-cpha"))
if (dev_read_bool(dev, "spi-cpol"))
mode |= SPI_CPOL;
if (dev_read_bool(dev, "spi-cpha"))