brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 23:20:26 +09:00
Code Issues Projects Releases Wiki Activity

spi: prevent overriding established bus settings

Browse Source 
The SPI stack relies on a proper bus speed/mode configuration
by calling dm_spi_claim_bus(). However the hitherto code
allowed to accidentally override those settings in
the spi_get_bus_and_cs() routine.

The initially established speed could be discarded by using
the slave platdata, which turned out to be an issue on
the platforms whose slave maximum supported frequency
is not on par with the maximum frequency of the bus controller.

This patch fixes above issue by configuring the bus from
spi_get_bus_and_cs() only in case it was not done before.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Marcin Wojtas 2019-11-21 05:38:47 +01:00 committed by Jagan Teki
parent 6954756a15
commit f7dd537098
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/spi/spi-uclass.c
View File

@ -323,6 +323,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
{
struct udevice *bus, *dev;
struct dm_spi_slave_platdata *plat;
struct spi_slave *slave;
bool created = false;
int ret;
@ -378,19 +379,20 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
slave->dev = dev;
}
plat = dev_get_parent_platdata(dev);
slave = dev_get_parent_priv(dev);
/* get speed and mode from platdata when available */
if (plat->max_hz) {
speed = plat->max_hz;
mode = plat->mode;
/*
* In case the operation speed is not yet established by
* dm_spi_claim_bus() ensure the bus is configured properly.
*/
if (!slave->speed) {
ret = spi_claim_bus(slave);
if (ret)
goto err;
}
ret = spi_set_speed_mode(bus, speed, mode);
if (ret)
goto err;
*busp = bus;
*devp = dev_get_parent_priv(dev);
*devp = slave;
debug("%s: bus=%p, slave=%p\n", __func__, bus, *devp);
return 0;