[PATCH 1/5] mmc: core: don't try to switch block size for dual rate mode

[Ulf Hansson]

On 21 September 2016 at 03:43, Shawn Lin <shawn.lin at rock-chips.com> wrote:
> From: Ziyuan Xu <xzy.xu at 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.xu at rock-chips.com>
> Signed-off-by: Shawn Lin <shawn.lin at rock-chips.com>

Thanks, applied for next!

Kind regards
Uffe

>
> ---
>
>  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 f0ed0af..2553d90 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -2576,7 +2576,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.3.7
>
>