With SD cards older than 2.0 the sd_send_if_cond() fails. Do
not assume it's an MMC card in this case. Instead, assume
it's a MMC card if sd_send_op_cond() fails.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
drivers/mci/mci-core.c | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index a6c81b8..57b82bf 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1148,26 +1148,16 @@ static int mci_card_probe(struct device_d *mci_dev)
/* Check if this card can handle the "SD Card Physical Layer Specification 2.0" */
rc = sd_send_if_cond(mci_dev);
- if (rc) {
+ rc = sd_send_op_cond(mci_dev);
+ if (rc && rc == -ETIMEDOUT) {
/* If the command timed out, we check for an MMC card */
- if (rc == -ETIMEDOUT) {
- pr_debug("Card seems to be a MultiMediaCard\n");
- rc = mmc_send_op_cond(mci_dev);
- if (rc) {
- pr_err("MultiMediaCard voltage select failed with %d\n", rc);
- goto on_error;
- }
- } else
- goto on_error;
- } else {
- /* Its a 2.xx card. Setup operation conditions */
- rc = sd_send_op_cond(mci_dev);
- if (rc) {
- pr_debug("Cannot setup SD card's operation condition\n");
- goto on_error;
- }
+ pr_debug("Card seems to be a MultiMediaCard\n");
+ rc = mmc_send_op_cond(mci_dev);
}
+ if (rc)
+ goto on_error;
+
rc = mci_startup(mci_dev);
if (rc) {
printf("Card's startup fails with %d\n", rc);
--
1.7.2.3
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
