[PATCH] mmc: bcm2835: Don't overwrite max frequency unconditionally

[Ulf Hansson]

On 12 February 2018 at 21:13, Stefan Wahren <stefan.wahren at i2se.com> wrote:
> From: Phil Elwell <phil at raspberrypi.org>
>
> The optional DT parameter max-frequency could init the max bus frequency.
> So take care of this, before setting the max bus frequency.
>
> Fixes: 660fc733bd74 ("mmc: bcm2835: Add new driver for the sdhost controller.")
> Signed-off-by: Phil Elwell <phil at raspberrypi.org>
> Signed-off-by: Stefan Wahren <stefan.wahren at i2se.com>

Thanks, applied for fixes and by adding a stable tag.

Kind regards
Uffe

> ---
>  drivers/mmc/host/bcm2835.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
> index 229dc18..768972a 100644
> --- a/drivers/mmc/host/bcm2835.c
> +++ b/drivers/mmc/host/bcm2835.c
> @@ -1265,7 +1265,8 @@ static int bcm2835_add_host(struct bcm2835_host *host)
>         char pio_limit_string[20];
>         int ret;
>
> -       mmc->f_max = host->max_clk;
> +       if (!mmc->f_max || mmc->f_max > host->max_clk)
> +               mmc->f_max = host->max_clk;
>         mmc->f_min = host->max_clk / SDCDIV_MAX_CDIV;
>
>         mmc->max_busy_timeout = ~0 / (mmc->f_max / 1000);
> --
> 2.7.4
>