diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-15 08:11:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-15 08:11:15 -0500 |
| commit | 782acf7b52db6bec1a796773e3033b4afcd6c9e2 (patch) | |
| tree | 9f86880a5163034fba0964a04200b2c675420218 /drivers | |
| parent | 71229098a61c0b8c5abe24c4a644234e1679bca3 (diff) | |
| parent | 3c8fb12b77849400ffc04737c113a7acff7d7f18 (diff) | |
| download | talos-obmc-uboot-782acf7b52db6bec1a796773e3033b4afcd6c9e2.tar.gz talos-obmc-uboot-782acf7b52db6bec1a796773e3033b4afcd6c9e2.zip | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/rockchip_dw_mmc.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf-uclass.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index aeaec6c865..9b4268ecdd 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -52,6 +52,8 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev) /* use non-removeable as sdcard and emmc as judgement */ if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "non-removable")) + host->dev_index = 0; + else host->dev_index = 1; return 0; diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 95ffad476d..19de964e61 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -55,11 +55,17 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, { struct spi_slave *slave; struct udevice *bus; - char name[30], *str; + char *str; int ret; +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF) + str = "spi_flash"; +#else + char name[30]; + snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs); str = strdup(name); +#endif ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode, "spi_flash_std", str, &bus, &slave); if (ret) |
