Skip to contentSkip to conversation

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

PATCH Superseded Vignesh R 4 participants 5 messages Apr 13, 2016 – May 10, 2016 SPI

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Vignesh R

author
#0 lore raw

PATCH v3 1/1 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.

---

v3: Update commit message to mention SPI mode changes

v2: Initialize speed, mode to 0 instead of -1

 cmd/sf.c                 | 2 ++
 drivers/spi/spi-uclass.c | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
cmd/sf.c +2 -0
index 42862d9d921a..286906c3a151 100644
@@ -88,6 +88,8 @@ static int do_spi_flash_probe(int argc, char * const argv[])
 #ifdef CONFIG_DM_SPI_FLASH
 	struct udevice *new, *bus_dev;
 	int ret;
+	/* In DM mode defaults will be taken from DT */
+	speed = 0, mode = 0;
 #else
 	struct spi_flash *new;
 #endif
drivers/spi/spi-uclass.c +6 -2
index 5561f36762f9..5fb5630e2981 100644
@@ -264,6 +264,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 		       struct udevice **busp, struct spi_slave **devp)
 {
 	struct udevice *bus, *dev;
+	struct dm_spi_slave_platdata *plat;
 	bool created = false;
 	int ret;
 
@@ -280,8 +281,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.
 	 */
 	if (ret == -ENODEV && drv_name) {
-		struct dm_spi_slave_platdata *plat;
-
 		debug("%s: Binding new device '%s', busnum=%d, cs=%d, driver=%s\n",
 		      __func__, dev_name, busnum, cs, drv_name);
 		ret = device_bind_driver(bus, drv_name, dev_name, &dev);
@@ -308,6 +307,11 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
 		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);
 	if (ret)
 		goto err;
Signature · 1 line
2.8.1
#1 lore raw

PATCH v3 1/1 dm: spi: Read default speed and mode values from DT

Quoted 8 lines · Vignesh R

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.

---

Quoted 7 lines

v3: Update commit message to mention SPI mode changes

v2: Initialize speed, mode to 0 instead of -1

 cmd/sf.c                 | 2 ++
 drivers/spi/spi-uclass.c | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
#2 lore raw

PATCH v3 1/1 dm: spi: Read default speed and mode values from DT

In reply to Vignesh R
Quoted 6 lines · Vignesh R

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.

Regards
Mugunthan V N

#3 lore raw

PATCH v3 1/1 dm: spi: Read default speed and mode values from DT

In reply to Vignesh R
Quoted 5 lines · Vignesh R

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.

Quoted 8 lines

---

v3: Update commit message to mention SPI mode changes

v2: Initialize speed, mode to 0 instead of -1

 cmd/sf.c                 | 2 ++

I think env_sf.c also need to update, pls- do change that as well.

Signature · 1 line
Jagan.
author
#4 lore raw

PATCH v3 1/1 dm: spi: Read default speed and mode values from DT

Quoted 9 lines · Jagan Teki
Quoted 8 lines · Vignesh R

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.

---

Quoted 7 lines
Quoted 5 lines

v3: Update commit message to mention SPI mode changes

v2: Initialize speed, mode to 0 instead of -1

 cmd/sf.c                 | 2 ++

I think env_sf.c also need to update, pls- do change that as well.

Ok, will post a v4

Signature · 2 lines
Regards
Vignesh