To let the card caps be card caps and not the intersection between card caps and host caps.
Signed-off-by: Sascha Hauer <[email protected]> --- drivers/mci/mci-core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index 86600ec..74aab91 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -66,6 +66,11 @@ * - Transcend SDHC, 8 GiB (Class 6) */ +static inline unsigned mci_caps(struct mci *mci) +{ + return mci->card_caps & mci->host->host_caps; +} + /** * Call the MMC/SD instance driver to run the command on the MMC/SD card * @param mci MCI instance @@ -900,7 +905,7 @@ static int mci_startup_sd(struct mci *mci) struct mci_cmd cmd; int err; - if (mci->card_caps & MMC_CAP_4_BIT_DATA) { + if (mci_caps(mci) & MMC_CAP_4_BIT_DATA) { dev_dbg(&mci->dev, "Prepare for bus width change\n"); mci_setup_cmd(&cmd, MMC_CMD_APP_CMD, mci->rca << 16, MMC_RSP_R1); err = mci_send_cmd(mci, &cmd, NULL); @@ -920,7 +925,7 @@ static int mci_startup_sd(struct mci *mci) mci_set_bus_width(mci, MMC_BUS_WIDTH_4); } /* if possible, speed up the transfer */ - if (mci->card_caps & MMC_CAP_SD_HIGHSPEED) + if (mci_caps(mci) & MMC_CAP_SD_HIGHSPEED) mci_set_clock(mci, 50000000); else mci_set_clock(mci, 25000000); @@ -943,7 +948,7 @@ static int mci_startup_mmc(struct mci *mci) }; /* if possible, speed up the transfer */ - if (mci->card_caps & MMC_CAP_MMC_HIGHSPEED) { + if (mci_caps(mci) & MMC_CAP_MMC_HIGHSPEED) { if (mci->card_caps & MMC_CAP_MMC_HIGHSPEED_52MHZ) mci_set_clock(mci, 52000000); else @@ -993,7 +998,6 @@ static int mci_startup_mmc(struct mci *mci) */ static int mci_startup(struct mci *mci) { - struct mci_host *host = mci->host; struct mci_cmd cmd; int err; @@ -1098,9 +1102,6 @@ static int mci_startup(struct mci *mci) mci_extract_card_capacity_from_csd(mci); - /* Restrict card's capabilities by what the host can do */ - mci->card_caps &= host->host_caps; - if (IS_SD(mci)) err = mci_startup_sd(mci); else -- 1.8.2.rc2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
