diff options
| author | Andre Heider <a.heider@gmail.com> | 2013-10-15 19:38:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-16 09:39:17 +0200 |
| commit | 43efd0e84f96d321655ccab5d8507479414aa333 (patch) | |
| tree | 2455581a89c62da0b3969c0f824036f82e08e0f5 /drivers/mci/mci-bcm2835.c | |
| parent | 64bf4200132a538d5598c441fb190a347bc85d0f (diff) | |
| download | barebox-43efd0e84f96d321655ccab5d8507479414aa333.tar.gz barebox-43efd0e84f96d321655ccab5d8507479414aa333.tar.xz | |
ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU
Add explicit flushing to prevent the 50MHz fallback.
Signed-off-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/mci-bcm2835.c')
| -rw-r--r-- | drivers/mci/mci-bcm2835.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c index abd38a35c9..576e8da6f4 100644 --- a/drivers/mci/mci-bcm2835.c +++ b/drivers/mci/mci-bcm2835.c @@ -28,6 +28,7 @@ * Author: Wilhelm Lundgren <wilhelm.lundgren@cybercom.com> */ +#include <asm/mmu.h> #include <common.h> #include <init.h> #include <mci.h> @@ -471,7 +472,7 @@ int bcm2835_mci_reset(struct mci_host *mci, struct device_d *mci_dev) static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data) { u32 val; - struct bcm2835_mbox_regs *regs = + struct bcm2835_mbox_regs __iomem *regs = (struct bcm2835_mbox_regs *) BCM2835_MBOX_PHYSADDR; /*Read out old msg*/ @@ -489,6 +490,7 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data) break; } val = BCM2835_MBOX_PROP_CHAN + ((u32) &clk_data->hdr); + dma_flush_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data)); writel(val, ®s->write); while (true) { @@ -504,6 +506,9 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data) if ((val & 0x0F) == BCM2835_MBOX_PROP_CHAN) break; } + + dma_inv_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data)); + if ((val & ~0x0F) == ((u32) &clk_data->hdr)) if (clk_data->get_clock_rate.tag_hdr.val_len & BCM2835_MBOX_TAG_VAL_LEN_RESPONSE) |