ARM: tegra: pull Tegra20 SoC DT from Linux v4.7

[karo-tx-uboot.git] / cmd / sf.c

diff --git a/cmd/sf.c b/cmd/sf.c
index 42862d9d921a9e0121169bb9c552a388cbf56fb8..65b117feee22c631cd7ef0f4d42570b52c15dea5 100644 (file)
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -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
@@ -123,7 +125,6 @@ static int do_spi_flash_probe(int argc, char * const argv[])
        ret = spi_find_bus_and_cs(bus, cs, &bus_dev, &new);
        if (!ret) {
                device_remove(new);
-               device_unbind(new);
        }
        flash = NULL;
        ret = spi_flash_probe_bus_cs(bus, cs, speed, mode, &new);