diff options
author | Tom Rini <trini@konsulko.com> | 2015-03-18 07:07:20 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-03-18 07:07:20 -0400 |
commit | d283a5709d8e2bf2682a2e22fb81a47b8d53c111 (patch) | |
tree | 7dfbca9d4e18a4ee7bf1b8ddb63b7042fd112167 /drivers/mmc/sdhci.c | |
parent | 052a681bae8ee91c9854089549b20c857d499fd7 (diff) | |
parent | 3a48944bc9a7455fec97e9df74c3d5bb600d3d7c (diff) | |
download | talos-obmc-uboot-d283a5709d8e2bf2682a2e22fb81a47b8d53c111.tar.gz talos-obmc-uboot-d283a5709d8e2bf2682a2e22fb81a47b8d53c111.zip |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/sdhci.c')
-rw-r--r-- | drivers/mmc/sdhci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 82d7984a51..5332e61cae 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -194,13 +194,13 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, #ifdef CONFIG_MMC_SDMA if (data->flags == MMC_DATA_READ) - start_addr = (unsigned int)data->dest; + start_addr = (unsigned long)data->dest; else - start_addr = (unsigned int)data->src; + start_addr = (unsigned long)data->src; if ((host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) && (start_addr & 0x7) != 0x0) { is_aligned = 0; - start_addr = (unsigned int)aligned_buffer; + start_addr = (unsigned long)aligned_buffer; if (data->flags != MMC_DATA_READ) memcpy(aligned_buffer, data->src, trans_bytes); } @@ -412,7 +412,7 @@ static int sdhci_init(struct mmc *mmc) if (host->quirks & SDHCI_QUIRK_NO_CD) { unsigned int status; - sdhci_writel(host, SDHCI_CTRL_CD_TEST_INS | SDHCI_CTRL_CD_TEST, + sdhci_writeb(host, SDHCI_CTRL_CD_TEST_INS | SDHCI_CTRL_CD_TEST, SDHCI_HOST_CONTROL); status = sdhci_readl(host, SDHCI_PRESENT_STATE); |