From: yibin.gong@nxp.com To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, broonie@kernel.org, festevam@gmail.com, vkoul@kernel.org, dan.j.williams@intel.com, u.kleine-koenig@pengutronix.de, catalin.marinas@arm.com, l.stach@pengutronix.de, will.deacon@arm.com Cc: linux-spi@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v5 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Mon, 10 Jun 2019 16:17:45 +0800 [thread overview] Message-ID: <20190610081753.11422-8-yibin.gong@nxp.com> (raw) In-Reply-To: <20190610081753.11422-1-yibin.gong@nxp.com> From: Robin Gong <yibin.gong@nxp.com> ERR009165 fixed on i.mx6ul/6ull/6sll. All other i.mx6/7 and i.mx8m/8mm still need this errata. Please refer to nxp official errata document from https://www.nxp.com/ . For removing workaround on those chips. Add new i.mx6ul type. Signed-off-by: Robin Gong <yibin.gong@nxp.com> Acked-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-imx.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 6795910..91660dc 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -57,6 +57,7 @@ enum spi_imx_devtype { IMX35_CSPI, /* CSPI on all i.mx except above */ IMX51_ECSPI, /* ECSPI on i.mx51 */ IMX53_ECSPI, /* ECSPI on i.mx53 and later */ + IMX6UL_ECSPI, /* ERR009165 fix from i.mx6ul */ }; struct spi_imx_data; @@ -75,6 +76,11 @@ struct spi_imx_devtype_data { bool has_slavemode; unsigned int fifo_size; bool dynamic_burst; + /* + * ERR009165 fixed or not: + * https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf + */ + bool tx_glitch_fixed; enum spi_imx_devtype devtype; }; @@ -128,7 +134,8 @@ static inline int is_imx35_cspi(struct spi_imx_data *d) static inline int is_imx51_ecspi(struct spi_imx_data *d) { - return d->devtype_data->devtype == IMX51_ECSPI; + return d->devtype_data->devtype == IMX51_ECSPI || + d->devtype_data->devtype == IMX6UL_ECSPI; } static inline int is_imx53_ecspi(struct spi_imx_data *d) @@ -585,9 +592,16 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, ctrl |= mx51_ecspi_clkdiv(spi_imx, t->speed_hz, &clk); spi_imx->spi_bus_clk = clk; - /* ERR009165: work in XHC mode as PIO */ - if (spi_imx->usedma) - ctrl &= ~MX51_ECSPI_CTRL_SMC; + /* + * ERR009165: work in XHC mode instead of SMC as PIO on the chips + * before i.mx6ul. + */ + if (spi_imx->usedma) { + if (spi_imx->devtype_data->tx_glitch_fixed) + ctrl |= MX51_ECSPI_CTRL_SMC; + else + ctrl &= ~MX51_ECSPI_CTRL_SMC; + } writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); @@ -615,6 +629,8 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) { u32 tx_wml = 0; + if (spi_imx->devtype_data->tx_glitch_fixed) + tx_wml = spi_imx->wml; /* * Configure the DMA register: setup the watermark * and enable DMA request. @@ -1012,6 +1028,23 @@ static struct spi_imx_devtype_data imx53_ecspi_devtype_data = { .devtype = IMX53_ECSPI, }; +static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = { + .intctrl = mx51_ecspi_intctrl, + .prepare_message = mx51_ecspi_prepare_message, + .prepare_transfer = mx51_ecspi_prepare_transfer, + .trigger = mx51_ecspi_trigger, + .rx_available = mx51_ecspi_rx_available, + .reset = mx51_ecspi_reset, + .setup_wml = mx51_setup_wml, + .fifo_size = 64, + .has_dmamode = true, + .dynamic_burst = true, + .has_slavemode = true, + .tx_glitch_fixed = true, + .disable = mx51_ecspi_disable, + .devtype = IMX6UL_ECSPI, +}; + static const struct platform_device_id spi_imx_devtype[] = { { .name = "imx1-cspi", @@ -1035,6 +1068,9 @@ static const struct platform_device_id spi_imx_devtype[] = { .name = "imx53-ecspi", .driver_data = (kernel_ulong_t) &imx53_ecspi_devtype_data, }, { + .name = "imx6ul-ecspi", + .driver_data = (kernel_ulong_t) &imx6ul_ecspi_devtype_data, + }, { /* sentinel */ } }; @@ -1047,6 +1083,7 @@ static const struct of_device_id spi_imx_dt_ids[] = { { .compatible = "fsl,imx35-cspi", .data = &imx35_cspi_devtype_data, }, { .compatible = "fsl,imx51-ecspi", .data = &imx51_ecspi_devtype_data, }, { .compatible = "fsl,imx53-ecspi", .data = &imx53_ecspi_devtype_data, }, + { .compatible = "fsl,imx6ul-ecspi", .data = &imx6ul_ecspi_devtype_data, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, spi_imx_dt_ids); @@ -1178,7 +1215,10 @@ static int spi_imx_dma_configure(struct spi_master *master) * For ERR009165 with tx_wml = 0 could enlarge burst size to fifo size * to speed up fifo filling as possible. */ - tx.dst_maxburst = spi_imx->devtype_data->fifo_size; + if (spi_imx->devtype_data->tx_glitch_fixed) + tx.dst_maxburst = spi_imx->wml; + else + tx.dst_maxburst = spi_imx->devtype_data->fifo_size; ret = dmaengine_slave_config(master->dma_tx, &tx); if (ret) { dev_err(spi_imx->dev, "TX dma configuration failed with %d\n", ret); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: yibin.gong@nxp.com To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, broonie@kernel.org, festevam@gmail.com, vkoul@kernel.org, dan.j.williams@intel.com, u.kleine-koenig@pengutronix.de, catalin.marinas@arm.com, l.stach@pengutronix.de, will.deacon@arm.com Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-imx@nxp.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Mon, 10 Jun 2019 16:17:45 +0800 [thread overview] Message-ID: <20190610081753.11422-8-yibin.gong@nxp.com> (raw) In-Reply-To: <20190610081753.11422-1-yibin.gong@nxp.com> From: Robin Gong <yibin.gong@nxp.com> ERR009165 fixed on i.mx6ul/6ull/6sll. All other i.mx6/7 and i.mx8m/8mm still need this errata. Please refer to nxp official errata document from https://www.nxp.com/ . For removing workaround on those chips. Add new i.mx6ul type. Signed-off-by: Robin Gong <yibin.gong@nxp.com> Acked-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-imx.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 6795910..91660dc 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -57,6 +57,7 @@ enum spi_imx_devtype { IMX35_CSPI, /* CSPI on all i.mx except above */ IMX51_ECSPI, /* ECSPI on i.mx51 */ IMX53_ECSPI, /* ECSPI on i.mx53 and later */ + IMX6UL_ECSPI, /* ERR009165 fix from i.mx6ul */ }; struct spi_imx_data; @@ -75,6 +76,11 @@ struct spi_imx_devtype_data { bool has_slavemode; unsigned int fifo_size; bool dynamic_burst; + /* + * ERR009165 fixed or not: + * https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf + */ + bool tx_glitch_fixed; enum spi_imx_devtype devtype; }; @@ -128,7 +134,8 @@ static inline int is_imx35_cspi(struct spi_imx_data *d) static inline int is_imx51_ecspi(struct spi_imx_data *d) { - return d->devtype_data->devtype == IMX51_ECSPI; + return d->devtype_data->devtype == IMX51_ECSPI || + d->devtype_data->devtype == IMX6UL_ECSPI; } static inline int is_imx53_ecspi(struct spi_imx_data *d) @@ -585,9 +592,16 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, ctrl |= mx51_ecspi_clkdiv(spi_imx, t->speed_hz, &clk); spi_imx->spi_bus_clk = clk; - /* ERR009165: work in XHC mode as PIO */ - if (spi_imx->usedma) - ctrl &= ~MX51_ECSPI_CTRL_SMC; + /* + * ERR009165: work in XHC mode instead of SMC as PIO on the chips + * before i.mx6ul. + */ + if (spi_imx->usedma) { + if (spi_imx->devtype_data->tx_glitch_fixed) + ctrl |= MX51_ECSPI_CTRL_SMC; + else + ctrl &= ~MX51_ECSPI_CTRL_SMC; + } writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); @@ -615,6 +629,8 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) { u32 tx_wml = 0; + if (spi_imx->devtype_data->tx_glitch_fixed) + tx_wml = spi_imx->wml; /* * Configure the DMA register: setup the watermark * and enable DMA request. @@ -1012,6 +1028,23 @@ static struct spi_imx_devtype_data imx53_ecspi_devtype_data = { .devtype = IMX53_ECSPI, }; +static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = { + .intctrl = mx51_ecspi_intctrl, + .prepare_message = mx51_ecspi_prepare_message, + .prepare_transfer = mx51_ecspi_prepare_transfer, + .trigger = mx51_ecspi_trigger, + .rx_available = mx51_ecspi_rx_available, + .reset = mx51_ecspi_reset, + .setup_wml = mx51_setup_wml, + .fifo_size = 64, + .has_dmamode = true, + .dynamic_burst = true, + .has_slavemode = true, + .tx_glitch_fixed = true, + .disable = mx51_ecspi_disable, + .devtype = IMX6UL_ECSPI, +}; + static const struct platform_device_id spi_imx_devtype[] = { { .name = "imx1-cspi", @@ -1035,6 +1068,9 @@ static const struct platform_device_id spi_imx_devtype[] = { .name = "imx53-ecspi", .driver_data = (kernel_ulong_t) &imx53_ecspi_devtype_data, }, { + .name = "imx6ul-ecspi", + .driver_data = (kernel_ulong_t) &imx6ul_ecspi_devtype_data, + }, { /* sentinel */ } }; @@ -1047,6 +1083,7 @@ static const struct of_device_id spi_imx_dt_ids[] = { { .compatible = "fsl,imx35-cspi", .data = &imx35_cspi_devtype_data, }, { .compatible = "fsl,imx51-ecspi", .data = &imx51_ecspi_devtype_data, }, { .compatible = "fsl,imx53-ecspi", .data = &imx53_ecspi_devtype_data, }, + { .compatible = "fsl,imx6ul-ecspi", .data = &imx6ul_ecspi_devtype_data, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, spi_imx_dt_ids); @@ -1178,7 +1215,10 @@ static int spi_imx_dma_configure(struct spi_master *master) * For ERR009165 with tx_wml = 0 could enlarge burst size to fifo size * to speed up fifo filling as possible. */ - tx.dst_maxburst = spi_imx->devtype_data->fifo_size; + if (spi_imx->devtype_data->tx_glitch_fixed) + tx.dst_maxburst = spi_imx->wml; + else + tx.dst_maxburst = spi_imx->devtype_data->fifo_size; ret = dmaengine_slave_config(master->dma_tx, &tx); if (ret) { dev_err(spi_imx->dev, "TX dma configuration failed with %d\n", ret); -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-10 8:17 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-10 8:17 [PATCH v5 00/15] add ecspi ERR009165 for i.mx6/7 soc family yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 01/15] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 02/15] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 03/15] Revert "dmaengine: imx-sdma: refine to load context only once" yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 04/15] dmaengine: imx-sdma: remove dupilicated sdma_load_context yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 05/15] dmaengine: imx-sdma: add mcu_2_ecspi script yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 06/15] spi: imx: fix ERR009165 yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` yibin.gong [this message] 2019-06-10 8:17 ` [PATCH v5 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul yibin.gong 2019-06-10 8:17 ` [PATCH v5 08/15] spi: imx: add new i.mx6ul compatible name in binding doc yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-07-09 2:17 ` Rob Herring 2019-07-09 2:17 ` Rob Herring 2019-06-10 8:17 ` [PATCH v5 09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 8:17 ` [PATCH v5 10/15] dma: imx-sdma: add i.mx6ul/6sx compatible name yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-11 22:35 ` Rob Herring 2019-06-11 22:35 ` Rob Herring 2019-06-12 2:32 ` Robin Gong 2019-06-12 2:32 ` Robin Gong 2019-06-12 2:32 ` Robin Gong 2019-06-12 2:32 ` Robin Gong 2019-06-10 8:17 ` [PATCH v5 11/15] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-09-24 13:27 ` Schrempf Frieder 2019-09-24 13:27 ` Schrempf Frieder 2019-09-25 11:26 ` Robin Gong 2019-09-25 11:26 ` Robin Gong 2019-09-25 14:53 ` Schrempf Frieder 2019-09-25 14:53 ` Schrempf Frieder 2019-09-25 14:53 ` Schrempf Frieder 2019-09-27 1:55 ` Robin Gong 2019-09-27 1:55 ` Robin Gong 2019-09-27 1:55 ` Robin Gong 2020-02-06 10:17 ` Schrempf Frieder 2020-02-06 10:17 ` Schrempf Frieder 2020-02-06 10:17 ` Schrempf Frieder 2020-02-10 12:28 ` Robin Gong 2020-02-10 12:28 ` Robin Gong 2020-02-10 12:28 ` Robin Gong 2019-06-10 8:17 ` [PATCH v5 12/15] ARM: dts: imx6ul: add dma support on ecspi yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-07-17 6:42 ` Shawn Guo 2019-07-17 6:42 ` Shawn Guo 2019-07-17 6:42 ` Shawn Guo 2019-07-23 9:39 ` Robin Gong 2019-07-23 9:39 ` Robin Gong 2019-07-23 9:39 ` Robin Gong 2019-07-24 0:48 ` Shawn Guo 2019-07-24 0:48 ` Shawn Guo 2019-07-24 0:48 ` Shawn Guo 2019-07-24 0:48 ` Shawn Guo 2019-07-24 1:53 ` Robin Gong 2019-07-24 1:53 ` Robin Gong 2019-07-24 1:53 ` Robin Gong 2019-09-24 9:53 ` Robin Gong 2019-09-24 9:53 ` Robin Gong 2019-09-24 9:53 ` Robin Gong 2019-09-24 9:53 ` Robin Gong 2019-06-10 8:17 ` [PATCH v5 13/15] ARM: dts: imx6sll: correct sdma compatible yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-07-17 6:42 ` Shawn Guo 2019-07-17 6:42 ` Shawn Guo 2019-06-10 8:17 ` [PATCH v5 14/15] arm64: defconfig: Enable SDMA on i.mx8mq/8mm yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-07-17 6:48 ` Shawn Guo 2019-07-17 6:48 ` Shawn Guo 2019-06-10 8:17 ` [PATCH v5 15/15] dmaengine: imx-sdma: add uart rom script yibin.gong 2019-06-10 8:17 ` yibin.gong 2019-06-10 12:55 ` Vinod Koul 2019-06-10 12:55 ` Vinod Koul 2019-06-11 3:04 ` Robin Gong 2019-06-11 3:04 ` Robin Gong 2019-06-11 3:04 ` Robin Gong 2019-06-11 3:04 ` Robin Gong 2019-06-11 4:37 ` Vinod Koul 2019-06-11 4:37 ` Vinod Koul 2019-06-11 4:37 ` Vinod Koul 2019-06-11 4:37 ` Vinod Koul 2019-06-21 8:42 ` [PATCH v5 00/15] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong 2019-06-21 8:42 ` Robin Gong 2019-06-21 8:42 ` Robin Gong 2019-06-24 0:16 ` Shawn Guo 2019-06-24 0:16 ` Shawn Guo 2019-06-24 0:16 ` Shawn Guo 2019-06-24 0:16 ` Shawn Guo 2019-06-25 8:05 ` Robin Gong 2019-06-25 8:05 ` Robin Gong 2019-06-25 8:05 ` Robin Gong 2019-06-25 8:05 ` Robin Gong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190610081753.11422-8-yibin.gong@nxp.com \ --to=yibin.gong@nxp.com \ --cc=broonie@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=dan.j.williams@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=dmaengine@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=l.stach@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=u.kleine-koenig@pengutronix.de \ --cc=vkoul@kernel.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.