diff options
| author | Tom Rini <[email protected]> | 2018-04-06 08:30:10 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-04-06 08:30:10 -0400 |
| commit | 6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f (patch) | |
| tree | 60b9a6a5709f219f8ca3a4c9792145357863cb4a /drivers | |
| parent | e294ba0678359bc32085c1714329af37e33e8f16 (diff) | |
| parent | 91e1bc53c4b61cd7b871d485f4c136084245e9a2 (diff) | |
Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot
Patch queue for rpi - 2018-04-06
Highlights this time around:
- Support for new RPi3 B+ model
- Fix for some SD cards on newer RPi firmware
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/bcm2835_sdhci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/bcm2835_sdhost.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 3157354d2ae..08bddd410e0 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -183,7 +183,7 @@ static int bcm2835_sdhci_probe(struct udevice *dev) if (base == FDT_ADDR_T_NONE) return -EINVAL; - ret = bcm2835_get_mmc_clock(); + ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); if (ret < 0) { debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); return ret; diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c index 1bf52a30196..bccd182e50c 100644 --- a/drivers/mmc/bcm2835_sdhost.c +++ b/drivers/mmc/bcm2835_sdhost.c @@ -35,6 +35,7 @@ #include <dm.h> #include <mmc.h> #include <asm/arch/msg.h> +#include <asm/arch/mbox.h> #include <asm/unaligned.h> #include <linux/compat.h> #include <linux/io.h> @@ -941,7 +942,7 @@ static int bcm2835_probe(struct udevice *dev) if (!host->ioaddr) return -ENOMEM; - host->max_clk = bcm2835_get_mmc_clock(); + host->max_clk = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_CORE); bcm2835_add_host(host); |