diff options
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/atmel-sdhci-pbl.c | 2 | ||||
| -rw-r--r-- | drivers/mci/atmel_mci_pbl.c | 5 | ||||
| -rw-r--r-- | drivers/mci/imx-esdhc-pbl.c | 2 | ||||
| -rw-r--r-- | drivers/mci/mci-core.c | 10 |
4 files changed, 17 insertions, 2 deletions
diff --git a/drivers/mci/atmel-sdhci-pbl.c b/drivers/mci/atmel-sdhci-pbl.c index 626e4008fe..2c5f107abd 100644 --- a/drivers/mci/atmel-sdhci-pbl.c +++ b/drivers/mci/atmel-sdhci-pbl.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <pbl.h> +#include <pbl/bio.h> #include <mci.h> #include <debug_ll.h> #include <mach/xload.h> diff --git a/drivers/mci/atmel_mci_pbl.c b/drivers/mci/atmel_mci_pbl.c index 767d6f3ce2..65d8b3632a 100644 --- a/drivers/mci/atmel_mci_pbl.c +++ b/drivers/mci/atmel_mci_pbl.c @@ -114,3 +114,8 @@ int at91_mci_bio_init(struct pbl_bio *bio, void __iomem *base, return 0; } + +void at91_mci_bio_set_highcapacity(bool highcapacity_card) +{ + atmci_sdcard.highcapacity_card = highcapacity_card; +} diff --git a/drivers/mci/imx-esdhc-pbl.c b/drivers/mci/imx-esdhc-pbl.c index 5a76e7a663..c81eba5b9d 100644 --- a/drivers/mci/imx-esdhc-pbl.c +++ b/drivers/mci/imx-esdhc-pbl.c @@ -44,7 +44,7 @@ static int esdhc_send_ext_csd(struct fsl_esdhc_host *host) return esdhc_send_cmd(host, &cmd, &data); } -static bool esdhc_bootpart_active(struct fsl_esdhc_host *host) +static bool __maybe_unused esdhc_bootpart_active(struct fsl_esdhc_host *host) { unsigned bootpart; diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index b8f71e1598..8c08a4f61f 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1941,6 +1941,16 @@ int mci_register(struct mci_host *host) host->supply = regulator_get(hw_dev, "vmmc"); if (IS_ERR(host->supply)) { + /* + * If you know your regulator to be always online on boot, but + * can't easily add a barebox driver for it, you may use + * barebox,allow-dummy-supply in your board's regulator device + * tree node to side step this warning. + * + * If you run into this warning, because your regulator driver + * hasn't probed the device yet, consider enabling deep probe + * for your board, to probe dependencies on demand. + */ dev_warn(hw_dev, "Failed to get 'vmmc' regulator (ignored).\n"); host->supply = NULL; } |