diff options
| author | Vignesh R <vigneshr@ti.com> | 2016-11-05 16:05:16 +0530 |
|---|---|---|
| committer | Jean-Jacques Hiblot <jjhiblot@ti.com> | 2017-08-02 16:11:37 +0200 |
| commit | 04faefb0b0eabc22f3794e58e481c29bfb5fa9cb (patch) | |
| tree | ae455a67db1f4f42386e939adeb0821fedbf263e | |
| parent | bf60047327436017202462383cf8ece61349c1d8 (diff) | |
| download | jacinto6evm-04faefb0b0eabc22f3794e58e481c29bfb5fa9cb.tar.gz | |
spi: ti_qspi: Fix baudrate divider calculation
commit 948b8bbd5fc4 ("spi: ti_qspi: Fix baudrate divider calculation") branch ti-u-boot-2017.01
Fix the divider calculation logic to choose a value so that the
resulting baudrate is either equal to or closest possible baudrate less
than the requested value. While at that, cleanup ti_spi_set_speed().
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
| -rw-r--r-- | drivers/spi/ti_qspi.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index ceaa0bd0b1..ea0f3b8424 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -16,6 +16,7 @@ #include <asm/omap_gpio.h> #include <asm/omap_common.h> #include <asm/ti-common/ti-edma3.h> +#include <linux/kernel.h> DECLARE_GLOBAL_DATA_PTR; @@ -117,21 +118,18 @@ static void ti_spi_set_speed(struct ti_qspi_priv *priv, uint hz) if (!hz) clk_div = 0; else - clk_div = (priv->fclk / hz) - 1; + clk_div = DIV_ROUND_UP(priv->fclk, hz) - 1; + + /* truncate clk_div value to QSPI_CLK_DIV_MAX */ + if (clk_div > QSPI_CLK_DIV_MAX) + clk_div = QSPI_CLK_DIV_MAX; debug("ti_spi_set_speed: hz: %d, clock divider %d\n", hz, clk_div); /* disable SCLK */ writel(readl(&priv->base->clk_ctrl) & ~QSPI_CLK_EN, &priv->base->clk_ctrl); - - /* assign clk_div values */ - if (clk_div < 0) - clk_div = 0; - else if (clk_div > QSPI_CLK_DIV_MAX) - clk_div = QSPI_CLK_DIV_MAX; - - /* enable SCLK */ + /* enable SCLK and program the clk divider */ writel(QSPI_CLK_EN | clk_div, &priv->base->clk_ctrl); } |