diff options
author | Tom Rini <trini@konsulko.com> | 2023-10-11 11:53:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-10-11 13:22:32 -0400 |
commit | 9598cf43f946fdbc8448db218965c00d64ce3d5e (patch) | |
tree | 00230631fe97ec3effede778cc229d762c6e8778 /drivers/spi/mtk_spim.c | |
parent | 5ae883c7160cf8b0604ec6d03798dd90fc81ee38 (diff) | |
parent | 1a1d48e36a1b185884e82d72457f7a274e4d1857 (diff) |
Merge branch '2023-10-11-assorted-fixes-and-updates'
- Assorted TI K3 updates, use ".dtso" for device tree overlays to match
general usage, mkimage fixes/improvements, assorted platform
updates/fixes, other assorted driver/platform fixes.
Diffstat (limited to 'drivers/spi/mtk_spim.c')
-rw-r--r-- | drivers/spi/mtk_spim.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/mtk_spim.c b/drivers/spi/mtk_spim.c index 418e586b91d..90f4c3cecb9 100644 --- a/drivers/spi/mtk_spim.c +++ b/drivers/spi/mtk_spim.c @@ -409,7 +409,7 @@ static int mtk_spim_transfer_wait(struct spi_slave *slave, { struct udevice *bus = dev_get_parent(slave->dev); struct mtk_spim_priv *priv = dev_get_priv(bus); - u32 sck_l, sck_h, clk_count, reg; + u32 pll_clk, sck_l, sck_h, clk_count, reg; ulong us = 1; int ret = 0; @@ -418,11 +418,12 @@ static int mtk_spim_transfer_wait(struct spi_slave *slave, else clk_count = op->data.nbytes; + pll_clk = priv->pll_clk_rate; sck_l = readl(priv->base + SPI_CFG2_REG) >> SPI_CFG2_SCK_LOW_OFFSET; sck_h = readl(priv->base + SPI_CFG2_REG) & SPI_CFG2_SCK_HIGH_MASK; - do_div(priv->pll_clk_rate, sck_l + sck_h + 2); + do_div(pll_clk, sck_l + sck_h + 2); - us = CLK_TO_US(priv->pll_clk_rate, clk_count * 8); + us = CLK_TO_US(pll_clk, clk_count * 8); us += 1000 * 1000; /* 1s tolerance */ if (us > UINT_MAX) |