From: Robin Gong <yibin.gong@nxp.com> To: "broonie@kernel.org" <broonie@kernel.org>, "shawnguo@kernel.org" <shawnguo@kernel.org>, "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>, "festevam@gmail.com" <festevam@gmail.com>, "robh+dt@kernel.org" <robh+dt@kernel.org>, "mark.rutland@arm.com" <mark.rutland@arm.com>, "u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>, "plyatov@gmail.com" <plyatov@gmail.com>, "dan.j.williams@intel.com" <dan.j.williams@intel.com>, "catalin.marinas@arm.com" <catalin.marinas@arm.com>, "will.deacon@arm.com" <will.deacon@arm.com> Cc: dl-linux-imx <linux-imx@nxp.com>, "linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, "kernel@pengutronix.de" <kernel@pengutronix.de> Subject: [v2,07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Fri, 26 Apr 2019 08:05:45 +0000 [thread overview] Message-ID: <1556265512-9130-8-git-send-email-yibin.gong@nxp.com> (raw) ERR009165 fix on i.mx6ul and next chip, such as i.mx6ull/i.mx8mq/i.mx8mm. Remove workaround on those chips. Add new i.mx6ul type for that. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/spi/spi-imx.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index eb56eac..2e5e978 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; @@ -128,7 +129,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 +587,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->devtype == IMX6UL_ECSPI) + ctrl |= MX51_ECSPI_CTRL_SMC; + else + ctrl &= ~MX51_ECSPI_CTRL_SMC; + } writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); @@ -615,6 +624,8 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) { u32 tx_wml = 0; + if (spi_imx->devtype_data->devtype == IMX6UL_ECSPI) + tx_wml = spi_imx->wml; /* * Configure the DMA register: setup the watermark * and enable DMA request. @@ -1012,6 +1023,22 @@ 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, + .disable = mx51_ecspi_disable, + .devtype = IMX6UL_ECSPI, +}; + static const struct platform_device_id spi_imx_devtype[] = { { .name = "imx1-cspi", @@ -1035,6 +1062,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 +1077,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);
WARNING: multiple messages have this Message-ID (diff)
From: Robin Gong <yibin.gong@nxp.com> To: "broonie@kernel.org" <broonie@kernel.org>, "shawnguo@kernel.org" <shawnguo@kernel.org>, "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>, "festevam@gmail.com" <festevam@gmail.com>, "robh+dt@kernel.org" <robh+dt@kernel.org>, "mark.rutland@arm.com" <mark.rutland@arm.com>, "u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>, "plyatov@gmail.com" <plyatov@gmail.com>, "dan.j.williams@intel.com" <dan.j.williams@intel.com>, "catalin.marinas@arm.com" <catalin.marinas@arm.com>, "will.deacon@arm.com" <will.deacon@arm.com> Cc: dl-linux-imx <linux-imx@nxp.com>, "linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, "kernel@pengutronix.de" <kernel@pengutronix.de> Subject: [PATCH v2 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Fri, 26 Apr 2019 08:05:45 +0000 [thread overview] Message-ID: <1556265512-9130-8-git-send-email-yibin.gong@nxp.com> (raw) Message-ID: <20190426080545.vFaRTFr_ktAj56A3tdk5jWHbOY3fso862TloS-5PJOs@z> (raw) In-Reply-To: <1556265512-9130-1-git-send-email-yibin.gong@nxp.com> ERR009165 fix on i.mx6ul and next chip, such as i.mx6ull/i.mx8mq/i.mx8mm. Remove workaround on those chips. Add new i.mx6ul type for that. Signed-off-by: Robin Gong <yibin.gong@nxp.com> --- drivers/spi/spi-imx.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index eb56eac..2e5e978 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; @@ -128,7 +129,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 +587,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->devtype == IMX6UL_ECSPI) + ctrl |= MX51_ECSPI_CTRL_SMC; + else + ctrl &= ~MX51_ECSPI_CTRL_SMC; + } writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); @@ -615,6 +624,8 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) { u32 tx_wml = 0; + if (spi_imx->devtype_data->devtype == IMX6UL_ECSPI) + tx_wml = spi_imx->wml; /* * Configure the DMA register: setup the watermark * and enable DMA request. @@ -1012,6 +1023,22 @@ 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, + .disable = mx51_ecspi_disable, + .devtype = IMX6UL_ECSPI, +}; + static const struct platform_device_id spi_imx_devtype[] = { { .name = "imx1-cspi", @@ -1035,6 +1062,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 +1077,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); -- 2.7.4
next prev reply other threads:[~2019-04-26 8:05 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-26 8:05 [PATCH v2 00/15] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong 2019-04-26 8:05 ` [v2,01/15] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong 2019-04-26 8:05 ` [PATCH v2 01/15] " Robin Gong 2019-04-26 8:05 ` [v2,02/15] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong 2019-04-26 8:05 ` [PATCH v2 02/15] " Robin Gong 2019-04-26 8:05 ` [v2,03/15] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong 2019-04-26 8:05 ` [PATCH v2 03/15] " Robin Gong 2019-04-26 8:05 ` [v2,04/15] dmaengine: imx-sdma: remove dupilicated sdma_load_context Robin Gong 2019-04-26 8:05 ` [PATCH v2 04/15] " Robin Gong 2019-04-26 8:05 ` [v2,05/15] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong 2019-04-26 8:05 ` [PATCH v2 05/15] " Robin Gong 2019-04-26 8:05 ` [v2,06/15] spi: imx: fix ERR009165 Robin Gong 2019-04-26 8:05 ` [PATCH v2 06/15] " Robin Gong 2019-04-26 9:07 ` [v2,06/15] " Lucas Stach 2019-04-26 9:07 ` [PATCH v2 06/15] " Lucas Stach 2019-04-26 9:22 ` [v2,06/15] " Robin Gong 2019-04-26 9:22 ` [EXT] Re: [PATCH v2 06/15] " Robin Gong 2019-04-26 9:37 ` [v2,06/15] " Lucas Stach 2019-04-26 9:37 ` [EXT] Re: [PATCH v2 06/15] " Lucas Stach 2019-04-26 9:53 ` [v2,06/15] " Robin Gong 2019-04-26 9:53 ` [EXT] Re: [PATCH v2 06/15] " Robin Gong 2019-04-26 8:05 ` Robin Gong [this message] 2019-04-26 8:05 ` [PATCH v2 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong 2019-04-26 9:09 ` [v2,07/15] " Lucas Stach 2019-04-26 9:09 ` [PATCH v2 07/15] " Lucas Stach 2019-04-26 9:32 ` [v2,07/15] " Robin Gong 2019-04-26 9:32 ` [EXT] Re: [PATCH v2 07/15] " Robin Gong 2019-04-26 8:05 ` [v2,08/15] dt-bindings: spi: imx: add i.mx6ul to state errata fixed Robin Gong 2019-04-26 8:05 ` [PATCH v2 08/15] " Robin Gong 2019-05-01 20:07 ` [v2,08/15] " Rob Herring 2019-05-01 20:07 ` [PATCH v2 08/15] " Rob Herring 2019-05-05 8:55 ` [EXT] " Robin Gong 2019-05-02 6:59 ` [v2,08/15] " Uwe Kleine-König 2019-05-02 6:59 ` [PATCH v2 08/15] " Uwe Kleine-König 2019-05-05 8:47 ` [EXT] " Robin Gong 2019-04-26 8:05 ` [v2,09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong 2019-04-26 8:05 ` [PATCH v2 09/15] " Robin Gong 2019-04-26 8:06 ` [v2,10/15] dt-bindings: dma: imx-sdma: add i.mx6ul/6sx compatible name Robin Gong 2019-04-26 8:06 ` [PATCH v2 10/15] " Robin Gong 2019-05-01 20:07 ` [v2,10/15] " Rob Herring 2019-05-01 20:07 ` [PATCH v2 10/15] " Rob Herring 2019-04-26 8:06 ` [v2,11/15] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong 2019-04-26 8:06 ` [PATCH v2 11/15] " Robin Gong 2019-04-26 8:06 ` [v2,12/15] ARM64: dts: freescale: imx8mm/8mq: update new compatible name for ecspi and sdma Robin Gong 2019-04-26 8:06 ` [PATCH v2 12/15] " Robin Gong 2019-04-26 8:06 ` [v2,13/15] ARM: dts: imx6ul: add dma support on ecspi Robin Gong 2019-04-26 8:06 ` [PATCH v2 13/15] " Robin Gong 2019-04-26 8:06 ` [v2,14/15] ARM: dts: imx6sll: correct ecspi/sdma compatible Robin Gong 2019-04-26 8:06 ` [PATCH v2 14/15] " Robin Gong 2019-04-26 8:06 ` [v2,15/15] arm64: defconfig: Enable SDMA on i.mx8mq/8mm Robin Gong 2019-04-26 8:06 ` [PATCH v2 15/15] " Robin Gong 2019-04-26 8:19 ` [PATCH v2 00/15] add ecspi ERR009165 for i.mx6/7 soc family Lucas Stach 2019-04-26 8:47 ` [EXT] " Robin Gong 2019-04-26 9:06 ` Lucas Stach
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=1556265512-9130-8-git-send-email-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=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=plyatov@gmail.com \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=u.kleine-koenig@pengutronix.de \ --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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).