shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mmc: lookup mszs for edmac, diff M base from idmac"

Browse Source 
This reverts commit 006e7b478d.
This commit is contained in:
lintao
2014-10-21 14:56:40 +08:00
parent 4c39d9819a
commit fd9bcea1b3
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk312x-sdk.dtsi
View File

@@ -74,8 +74,8 @@
};
&emmc {
clock-frequency = <50000000>;
clock-freq-min-max = <400000 50000000>;
clock-frequency = <37500000>;
clock-freq-min-max = <400000 37500000>;
supports-highspeed;
supports-emmc;
bootpart-no-access;

5
drivers/mmc/host/rk_sdmmc.c
View File

@@ -614,7 +614,6 @@ static void dw_mci_edmac_start_dma(struct dw_mci *host, unsigned int sg_len)
struct dma_slave_config slave_config;
struct dma_async_tx_descriptor *desc = NULL;
struct scatterlist *sgl = host->data->sg;
const u32 mszs[] = {1, 4, 8, 16, 32, 64, 128, 256};
u32 sg_elems = host->data->sg_len;
int ret = 0;
@@ -625,9 +624,7 @@ static void dw_mci_edmac_start_dma(struct dw_mci *host, unsigned int sg_len)
slave_config.src_addr_width = slave_config.dst_addr_width;
/* Match FIFO dma burst MSIZE with external dma config*/
slave_config.dst_maxburst = mszs[((host->fifoth_val) >> 28) && 0x7];
if ((host->mmc->restrict_caps & RESTRICT_CARD_TYPE_SDIO))
slave_config.dst_maxburst /= mszs[((host->fifoth_val) >> 28) && 0x7];
slave_config.dst_maxburst = ((host->fifoth_val) >> 28) && 0x7;
slave_config.src_maxburst = slave_config.dst_maxburst;
if(host->data->flags & MMC_DATA_WRITE){