]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
spi/rockchip: Avoid accidentally turning off the clock
authorDoug Anderson <dianders@chromium.org>
Thu, 28 Aug 2014 23:43:48 +0000 (16:43 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 29 Aug 2014 11:07:38 +0000 (12:07 +0100)
If our client is requesting a clock that is above the maximum clock
then the following division will result in 0:
  rs->max_freq / rs->speed

We'll then program 0 into the SPI_BAUDR register.  The Rockchip TRM
says: "If the value is 0, the serial output clock (sclk_out) is
disabled."

It's much better to end up with the fastest possible clock rather than
a clock that is off, so enforce a minimum value.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-rockchip.c

index 6321326eb751448ecb128bda8f5b7bf2a8258150..cd0e08b0c9f66c7d99d1421e8fdbf882f62f7e77 100644 (file)
@@ -499,7 +499,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs)
        }
 
        /* div doesn't support odd number */
        }
 
        /* div doesn't support odd number */
-       div = rs->max_freq / rs->speed;
+       div = max_t(u32, rs->max_freq / rs->speed, 1);
        div = (div + 1) & 0xfffe;
 
        spi_enable_chip(rs, 0);
        div = (div + 1) & 0xfffe;
 
        spi_enable_chip(rs, 0);