diff options
| author | Kever Yang <kever.yang@rock-chips.com> | 2016-07-22 17:22:50 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-31 07:24:20 -0600 |
| commit | 46683f3da191a4c2156d5473c23b9923c461912c (patch) | |
| tree | 215fabaa1e45e5bbc1f8e1766c2c152f63445696 | |
| parent | 5c928d02044345b843202f23540c3765468c1d6f (diff) | |
| download | u-boot-imx-46683f3da191a4c2156d5473c23b9923c461912c.zip u-boot-imx-46683f3da191a4c2156d5473c23b9923c461912c.tar.gz u-boot-imx-46683f3da191a4c2156d5473c23b9923c461912c.tar.bz2 | |
mmc-uclass: correct the device number
Not like the mmc-legacy which the devnum starts from 1, it starts from 0
in mmc-uclass, so the device number should be (devnum + 1) in get_mmc_num().
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| -rw-r--r-- | drivers/mmc/mmc-uclass.c | 6 | ||||
| -rw-r--r-- | include/mmc.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 38ced41..f262c6e 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -111,18 +111,18 @@ struct mmc *find_mmc_device(int dev_num) int get_mmc_num(void) { - return max(blk_find_max_devnum(IF_TYPE_MMC), 0); + return max((blk_find_max_devnum(IF_TYPE_MMC) + 1), 0); } int mmc_get_next_devnum(void) { int ret; - ret = get_mmc_num(); + ret = blk_find_max_devnum(IF_TYPE_MMC); if (ret < 0) return ret; - return ret + 1; + return ret; } struct blk_desc *mmc_get_blk_desc(struct mmc *mmc) diff --git a/include/mmc.h b/include/mmc.h index 8f309f1..dd47f34 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -503,6 +503,12 @@ void mmc_set_clock(struct mmc *mmc, uint clock); struct mmc *find_mmc_device(int dev_num); int mmc_set_dev(int dev_num); void print_mmc_devices(char separator); + +/** + * get_mmc_num() - get the total MMC device number + * + * @return 0 if there is no MMC device, else the number of devices + */ int get_mmc_num(void); int mmc_hwpart_config(struct mmc *mmc, const struct mmc_hwpart_conf *conf, enum mmc_hwpart_conf_mode mode); |