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

This reverts commit 006e7b478d3e63583f91598d5e28111c1ccb0df9.

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index ac7b2b3bc9d728293725feb51a182d5b5d4925db..f33a9a11b38294a21fd0d15e0bfba832459688a6 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -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;

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index 2457b85b8cc612467d292e129a73fc8faca6fa8a..0f50c70b6a13ed0fd71b7644a4126c6217a47ec8 100755 (executable)
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -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){