This patch modified set_cs_timing callback:
1 support spi_device set cs_timing in their driver;
2 support set absolute time but no clk count, because;
clk src will change in different platform;
3 call this function in prepare_message but not in other API.
Signed-off-by: Mason Zhang <[email protected]>
---
drivers/spi/spi-mt65xx.c | 102 +++++++++++++++++++++------------------
1 file changed, 56 insertions(+), 46 deletions(-)
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 6f2925118b98..7a34f5b1201d 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -208,6 +208,60 @@ static void mtk_spi_reset(struct mtk_spi *mdata)
writel(reg_val, mdata->base + SPI_CMD_REG);
}
+static int mtk_spi_set_hw_cs_timing(struct spi_device *spi)
+{
+ struct mtk_spi *mdata = spi_master_get_devdata(spi->master);
+ struct spi_delay *cs_setup = &spi->cs_setup;
+ struct spi_delay *cs_hold = &spi->cs_hold;
+ struct spi_delay *cs_inactive = &spi->cs_inactive;
+ u16 setup, hold, inactive;
+ u32 reg_val;
+ int delay;
+
+ delay = spi_delay_to_ns(cs_setup, NULL);
+ if (delay < 0)
+ return delay;
+ setup = (delay / 1000) * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000);
+
+ delay = spi_delay_to_ns(cs_hold, NULL);
+ if (delay < 0)
+ return delay;
+ hold = (delay / 1000) * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000);
+
+ delay = spi_delay_to_ns(cs_inactive, NULL);
+ if (delay < 0)
+ return delay;
+ inactive = (delay / 1000) * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000);
+
+ setup = setup ? setup : 1;
+ hold = hold ? hold : 1;
+ inactive = inactive ? inactive : 1;
+
+ reg_val = readl(mdata->base + SPI_CFG0_REG);
+ if (mdata->dev_comp->enhance_timing) {
+ reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_HOLD_OFFSET);
+ reg_val |= (((hold - 1) & 0xffff)
+ << SPI_ADJUST_CFG0_CS_HOLD_OFFSET);
+ reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_SETUP_OFFSET);
+ reg_val |= (((setup - 1) & 0xffff)
+ << SPI_ADJUST_CFG0_CS_SETUP_OFFSET);
+ } else {
+ reg_val &= ~(0xff << SPI_CFG0_CS_HOLD_OFFSET);
+ reg_val |= (((hold - 1) & 0xff) << SPI_CFG0_CS_HOLD_OFFSET);
+ reg_val &= ~(0xff << SPI_CFG0_CS_SETUP_OFFSET);
+ reg_val |= (((setup - 1) & 0xff)
+ << SPI_CFG0_CS_SETUP_OFFSET);
+ }
+ writel(reg_val, mdata->base + SPI_CFG0_REG);
+
+ reg_val = readl(mdata->base + SPI_CFG1_REG);
+ reg_val &= ~SPI_CFG1_CS_IDLE_MASK;
+ reg_val |= (((inactive - 1) & 0xff) << SPI_CFG1_CS_IDLE_OFFSET);
+ writel(reg_val, mdata->base + SPI_CFG1_REG);
+
+ return 0;
+}
+
static int mtk_spi_prepare_message(struct spi_master *master,
struct spi_message *msg)
{
@@ -284,6 +338,8 @@ static int mtk_spi_prepare_message(struct spi_master *master,
<< SPI_CFG1_GET_TICK_DLY_OFFSET);
writel(reg_val, mdata->base + SPI_CFG1_REG);
+ /* set hw cs timing */
+ mtk_spi_set_hw_cs_timing(spi);
return 0;
}
@@ -528,52 +584,6 @@ static bool mtk_spi_can_dma(struct spi_master *master,
(unsigned long)xfer->rx_buf % 4 == 0);
}
-static int mtk_spi_set_hw_cs_timing(struct spi_device *spi,
- struct spi_delay *setup,
- struct spi_delay *hold,
- struct spi_delay *inactive)
-{
- struct mtk_spi *mdata = spi_master_get_devdata(spi->master);
- u16 setup_dly, hold_dly, inactive_dly;
- u32 reg_val;
-
- if ((setup && setup->unit != SPI_DELAY_UNIT_SCK) ||
- (hold && hold->unit != SPI_DELAY_UNIT_SCK) ||
- (inactive && inactive->unit != SPI_DELAY_UNIT_SCK)) {
- dev_err(&spi->dev,
- "Invalid delay unit, should be SPI_DELAY_UNIT_SCK\n");
- return -EINVAL;
- }
-
- setup_dly = setup ? setup->value : 1;
- hold_dly = hold ? hold->value : 1;
- inactive_dly = inactive ? inactive->value : 1;
-
- reg_val = readl(mdata->base + SPI_CFG0_REG);
- if (mdata->dev_comp->enhance_timing) {
- reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_HOLD_OFFSET);
- reg_val |= (((hold_dly - 1) & 0xffff)
- << SPI_ADJUST_CFG0_CS_HOLD_OFFSET);
- reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_SETUP_OFFSET);
- reg_val |= (((setup_dly - 1) & 0xffff)
- << SPI_ADJUST_CFG0_CS_SETUP_OFFSET);
- } else {
- reg_val &= ~(0xff << SPI_CFG0_CS_HOLD_OFFSET);
- reg_val |= (((hold_dly - 1) & 0xff) << SPI_CFG0_CS_HOLD_OFFSET);
- reg_val &= ~(0xff << SPI_CFG0_CS_SETUP_OFFSET);
- reg_val |= (((setup_dly - 1) & 0xff)
- << SPI_CFG0_CS_SETUP_OFFSET);
- }
- writel(reg_val, mdata->base + SPI_CFG0_REG);
-
- reg_val = readl(mdata->base + SPI_CFG1_REG);
- reg_val &= ~SPI_CFG1_CS_IDLE_MASK;
- reg_val |= (((inactive_dly - 1) & 0xff) << SPI_CFG1_CS_IDLE_OFFSET);
- writel(reg_val, mdata->base + SPI_CFG1_REG);
-
- return 0;
-}
-
static int mtk_spi_setup(struct spi_device *spi)
{
struct mtk_spi *mdata = spi_master_get_devdata(spi->master);
--
2.18.0
On Tue, Aug 3, 2021 at 1:42 PM Mason Zhang <[email protected]> wrote:
>
> This patch modified set_cs_timing callback:
> 1 support spi_device set cs_timing in their driver;
> 2 support set absolute time but no clk count, because;
> clk src will change in different platform;
> 3 call this function in prepare_message but not in other API.
Perhaps it should be 3 patches?
...
> +static int mtk_spi_set_hw_cs_timing(struct spi_device *spi)
> +{
> + struct mtk_spi *mdata = spi_master_get_devdata(spi->master);
> + struct spi_delay *cs_setup = &spi->cs_setup;
> + struct spi_delay *cs_hold = &spi->cs_hold;
> + struct spi_delay *cs_inactive = &spi->cs_inactive;
> + u16 setup, hold, inactive;
> + u32 reg_val;
> + int delay;
> +
> + delay = spi_delay_to_ns(cs_setup, NULL);
> + if (delay < 0)
> + return delay;
> + setup = (delay / 1000) * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000);
1000 is NSEC_PER_USEC (here and below)?
> + delay = spi_delay_to_ns(cs_hold, NULL);
> + if (delay < 0)
> + return delay;
> + hold = (delay / 1000) * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000);
> +
> + delay = spi_delay_to_ns(cs_inactive, NULL);
> + if (delay < 0)
> + return delay;
> + inactive = (delay / 1000) * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000);
> + setup = setup ? setup : 1;
> + hold = hold ? hold : 1;
> + inactive = inactive ? inactive : 1;
All of these can be simplified by using ?: (short ternary) form.
> + reg_val = readl(mdata->base + SPI_CFG0_REG);
> + if (mdata->dev_comp->enhance_timing) {
> + reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_HOLD_OFFSET);
> + reg_val |= (((hold - 1) & 0xffff)
> + << SPI_ADJUST_CFG0_CS_HOLD_OFFSET);
> + reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_SETUP_OFFSET);
> + reg_val |= (((setup - 1) & 0xffff)
> + << SPI_ADJUST_CFG0_CS_SETUP_OFFSET);
> + } else {
> + reg_val &= ~(0xff << SPI_CFG0_CS_HOLD_OFFSET);
> + reg_val |= (((hold - 1) & 0xff) << SPI_CFG0_CS_HOLD_OFFSET);
> + reg_val &= ~(0xff << SPI_CFG0_CS_SETUP_OFFSET);
> + reg_val |= (((setup - 1) & 0xff)
> + << SPI_CFG0_CS_SETUP_OFFSET);
> + }
> + writel(reg_val, mdata->base + SPI_CFG0_REG);
> +
> + reg_val = readl(mdata->base + SPI_CFG1_REG);
> + reg_val &= ~SPI_CFG1_CS_IDLE_MASK;
> + reg_val |= (((inactive - 1) & 0xff) << SPI_CFG1_CS_IDLE_OFFSET);
> + writel(reg_val, mdata->base + SPI_CFG1_REG);
> +
> + return 0;
> +}
--
With Best Regards,
Andy Shevchenko
On Tue, Aug 03, 2021 at 09:20:19PM +0300, Andy Shevchenko wrote:
> On Tue, Aug 3, 2021 at 1:42 PM Mason Zhang <[email protected]> wrote:
> > + inactive = inactive ? inactive : 1;
> All of these can be simplified by using ?: (short ternary) form.
Please don't, if anything just don't use the ternery operator at all for
things like this - it doesn't help with legibility.