V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: spi: Read default speed and mode values from DT 

In case of DT boot, don't read default speed and mode for SPI from
CONFIG_*, instead read from DT node. This will make sure that boards
with multiple SPI/QSPI controllers can be probed at different
bus frequencies and SPI modes.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
Vignesh R 2016-07-06 10:04:28 +05:30 committed by Jagan Teki
parent e835a74159
commit 96907c0fe5
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/sf.c
View File

@ -88,6 +88,8 @@ static int do_spi_flash_probe(int argc, char * const argv[])
#ifdef CONFIG_DM_SPI_FLASH #ifdef CONFIG_DM_SPI_FLASH
struct udevice *new, *bus_dev; struct udevice *new, *bus_dev;
int ret; int ret;
/* In DM mode defaults will be taken from DT */
speed = 0, mode = 0;
#else #else
struct spi_flash *new; struct spi_flash *new;
#endif #endif

8
common/env_sf.c
View File

@ -55,9 +55,9 @@ int saveenv(void)
#ifdef CONFIG_DM_SPI_FLASH #ifdef CONFIG_DM_SPI_FLASH
struct udevice *new; struct udevice *new;
/* speed and mode will be read from DT */
ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
CONFIG_ENV_SPI_MAX_HZ, 0, 0, &new);
CONFIG_ENV_SPI_MODE, &new);
if (ret) { if (ret) {
set_default_env("!spi_flash_probe_bus_cs() failed"); set_default_env("!spi_flash_probe_bus_cs() failed");
return 1; return 1;
@ -245,9 +245,9 @@ int saveenv(void)
#ifdef CONFIG_DM_SPI_FLASH #ifdef CONFIG_DM_SPI_FLASH
struct udevice *new; struct udevice *new;
/* speed and mode will be read from DT */
ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
CONFIG_ENV_SPI_MAX_HZ, 0, 0, &new);
CONFIG_ENV_SPI_MODE, &new);
if (ret) { if (ret) {
set_default_env("!spi_flash_probe_bus_cs() failed"); set_default_env("!spi_flash_probe_bus_cs() failed");
return 1; return 1;

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

@ -278,6 +278,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
struct udevice **busp, struct spi_slave **devp) struct udevice **busp, struct spi_slave **devp)
{ {
struct udevice *bus, *dev; struct udevice *bus, *dev;
struct dm_spi_slave_platdata *plat;
bool created = false; bool created = false;
int ret; int ret;
@ -294,8 +295,6 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
* SPI flash chip - we will bind to the correct driver. * SPI flash chip - we will bind to the correct driver.
*/ */
if (ret == -ENODEV && drv_name) { if (ret == -ENODEV && drv_name) {
struct dm_spi_slave_platdata *plat;
debug("%s: Binding new device '%s', busnum=%d, cs=%d, driver=%s\n", debug("%s: Binding new device '%s', busnum=%d, cs=%d, driver=%s\n",
__func__, dev_name, busnum, cs, drv_name); __func__, dev_name, busnum, cs, drv_name);
ret = device_bind_driver(bus, drv_name, dev_name, &dev); ret = device_bind_driver(bus, drv_name, dev_name, &dev);
@ -322,6 +321,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
slave->dev = dev; slave->dev = dev;
} }
plat = dev_get_parent_platdata(dev);
if (!speed) {
speed = plat->max_hz;
mode = plat->mode;
}
ret = spi_set_speed_mode(bus, speed, mode); ret = spi_set_speed_mode(bus, speed, mode);
if (ret) if (ret)
goto err; goto err;