diff options
| author | Stefan Agner <stefan@agner.ch> | 2014-06-25 18:03:08 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-06-25 18:03:08 +0200 |
| commit | 1f87d8d99c42977476725790380896f371c40c17 (patch) | |
| tree | 292cedee08c0682dbd1511ebf3aed2020ba42e7d /drivers | |
| parent | 9d719bc306859e455a78a561b08d1ae697ca75b6 (diff) | |
mmc: use SD/MMC host ID for block device name ID
From: Stefan Agner <stefan@agner.ch>
By using the SD/MMC host device ID as a starting point for block
device numbering, one can reliably predict the first block device
name (at least for the first controller). This is especially useful
for SoCs with multiple SD/MMC host controller, where the controller
with index 0 is connected to a eMMC device.
Usually the first controller gets the first block device name ID,
however this is not guaranteed. Also if the first controller is
aliased as second controller and visa-versa (using device tree
aliases), the block device name ID assignation is not ordered by
the SD/MMC host device ID (since mmc_rescan is called in order of
the memory mapped pheripherial addresses).
Signed-off-by: Stefan Agner <stefan@agner.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/card/block.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index a49cd832f6f4..6cf73090324e 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1977,7 +1977,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, * index anymore so we keep track of a name index. */ if (!subname) { - md->name_idx = find_first_zero_bit(name_use, max_devices); + md->name_idx = find_next_zero_bit(name_use, max_devices, + card->host->index); __set_bit(md->name_idx, name_use); } else md->name_idx = ((struct mmc_blk_data *) |