From: Ziyuan Xu <xzy...@rock-chips.com>

Per spec, block size should always be 512 bytes for dual rate mode,
so any attempts to switch the block size under dual rate mode should
be neglected.

Signed-off-by: Ziyuan Xu <xzy...@rock-chips.com>
Signed-off-by: Shawn Lin <shawn....@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hans...@linaro.org>
(cherry picked from commit 1712c9373f98ae8ed41599a8d7841a6fba29c264)
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
 drivers/mmc/core/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index df074f8c7cb7..3e17268b9994 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2406,7 +2406,8 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int 
blocklen)
 {
        struct mmc_command cmd = {0};
 
-       if (mmc_card_blockaddr(card) || mmc_card_ddr52(card))
+       if (mmc_card_blockaddr(card) || mmc_card_ddr52(card) ||
+           mmc_card_hs400(card) || mmc_card_hs400es(card))
                return 0;
 
        cmd.opcode = MMC_SET_BLOCKLEN;
-- 
2.20.0

Reply via email to