From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v1,07/15] spi: imx: remove ERR009165 workaround on i.mx6ul From: Sascha Hauer Message-Id: <20190424063240.vr5in5nez6hl2zgr@pengutronix.de> Date: Wed, 24 Apr 2019 08:32:40 +0200 To: Robin Gong Cc: "broonie@kernel.org" , "shawnguo@kernel.org" , "festevam@gmail.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "u.kleine-koenig@pengutronix.de" , "plyatov@gmail.com" , "sean.nyekjaer@prevas.dk" , dl-linux-imx , "linux-spi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "dmaengine@vger.kernel.org" , "devicetree@vger.kernel.org" , "kernel@pengutronix.de" List-ID: T24gVHVlLCBBcHIgMjMsIDIwMTkgYXQgMDE6NTE6MTBQTSArMDAwMCwgUm9iaW4gR29uZyB3cm90 ZToKPiAgICBFUlIwMDkxNjUgZml4IG9uIGkubXg2dWwgYW5kIG5leHQgY2hpcCwgc3VjaCBhcyBp Lm14NnVsbC9pLm14OG1xL2kubXg4bW0uCj4gUmVtb3ZlIHdvcmthcm91bmQgb24gdGhvc2UgY2hp cHMuIEFkZCBuZXcgaS5teDZ1bCB0eXBlIGZvciB0aGF0Lgo+IAo+IFNpZ25lZC1vZmYtYnk6IFJv YmluIEdvbmcgPHlpYmluLmdvbmdAbnhwLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9zcGkvc3BpLWlt eC5jIHwgMzkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tCj4gIDEgZmls ZSBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL3NwaS9zcGktaW14LmMgYi9kcml2ZXJzL3NwaS9zcGktaW14LmMKPiBpbmRl eCBlYjU2ZWFjLi4yZTVlOTc4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvc3BpL3NwaS1pbXguYwo+ ICsrKyBiL2RyaXZlcnMvc3BpL3NwaS1pbXguYwo+IEBAIC01Nyw2ICs1Nyw3IEBAIGVudW0gc3Bp X2lteF9kZXZ0eXBlIHsKPiAgCUlNWDM1X0NTUEksCS8qIENTUEkgb24gYWxsIGkubXggZXhjZXB0 IGFib3ZlICovCj4gIAlJTVg1MV9FQ1NQSSwJLyogRUNTUEkgb24gaS5teDUxICovCj4gIAlJTVg1 M19FQ1NQSSwJLyogRUNTUEkgb24gaS5teDUzIGFuZCBsYXRlciAqLwo+ICsJSU1YNlVMX0VDU1BJ LAkvKiBFUlIwMDkxNjUgZml4IGZyb20gaS5teDZ1bCAqLwo+ICB9Owo+ICAKPiAgc3RydWN0IHNw aV9pbXhfZGF0YTsKPiBAQCAtMTI4LDcgKzEyOSw4IEBAIHN0YXRpYyBpbmxpbmUgaW50IGlzX2lt eDM1X2NzcGkoc3RydWN0IHNwaV9pbXhfZGF0YSAqZCkKPiAgCj4gIHN0YXRpYyBpbmxpbmUgaW50 IGlzX2lteDUxX2Vjc3BpKHN0cnVjdCBzcGlfaW14X2RhdGEgKmQpCj4gIHsKPiAtCXJldHVybiBk LT5kZXZ0eXBlX2RhdGEtPmRldnR5cGUgPT0gSU1YNTFfRUNTUEk7Cj4gKwlyZXR1cm4gZC0+ZGV2 dHlwZV9kYXRhLT5kZXZ0eXBlID09IElNWDUxX0VDU1BJIHx8Cj4gKwkgICAgICAgZC0+ZGV2dHlw ZV9kYXRhLT5kZXZ0eXBlID09IElNWDZVTF9FQ1NQSTsKPiAgfQo+ICAKPiAgc3RhdGljIGlubGlu ZSBpbnQgaXNfaW14NTNfZWNzcGkoc3RydWN0IHNwaV9pbXhfZGF0YSAqZCkKPiBAQCAtNTg1LDkg KzU4NywxNiBAQCBzdGF0aWMgaW50IG14NTFfZWNzcGlfcHJlcGFyZV90cmFuc2ZlcihzdHJ1Y3Qg c3BpX2lteF9kYXRhICpzcGlfaW14LAo+ICAJY3RybCB8PSBteDUxX2Vjc3BpX2Nsa2RpdihzcGlf aW14LCB0LT5zcGVlZF9oeiwgJmNsayk7Cj4gIAlzcGlfaW14LT5zcGlfYnVzX2NsayA9IGNsazsK PiAgCj4gLQkvKiBFUlIwMDkxNjU6IHdvcmsgaW4gWEhDIG1vZGUgYXMgUElPICovCj4gLQlpZiAo c3BpX2lteC0+dXNlZG1hKQo+IC0JCWN0cmwgJj0gfk1YNTFfRUNTUElfQ1RSTF9TTUM7Cj4gKwkv Kgo+ICsJICogRVJSMDA5MTY1OiB3b3JrIGluIFhIQyBtb2RlIGluc3RlYWQgb2YgU01DIGFzIFBJ TyBvbiB0aGUgY2hpcHMKPiArCSAqIGJlZm9yZSBpLm14NnVsLgo+ICsJICovCj4gKwlpZiAoc3Bp X2lteC0+dXNlZG1hKSB7Cj4gKwkJaWYgKHNwaV9pbXgtPmRldnR5cGVfZGF0YS0+ZGV2dHlwZSA9 PSBJTVg2VUxfRUNTUEkpCj4gKwkJCWN0cmwgfD0gTVg1MV9FQ1NQSV9DVFJMX1NNQzsKPiArCQll bHNlCj4gKwkJCWN0cmwgJj0gfk1YNTFfRUNTUElfQ1RSTF9TTUM7Cj4gKwl9Cj4gIAo+ICAJd3Jp dGVsKGN0cmwsIHNwaV9pbXgtPmJhc2UgKyBNWDUxX0VDU1BJX0NUUkwpOwo+ICAKPiBAQCAtNjE1 LDYgKzYyNCw4IEBAIHN0YXRpYyB2b2lkIG14NTFfc2V0dXBfd21sKHN0cnVjdCBzcGlfaW14X2Rh dGEgKnNwaV9pbXgpCj4gIHsKPiAgCXUzMiB0eF93bWwgPSAwOwo+ICAKPiArCWlmIChzcGlfaW14 LT5kZXZ0eXBlX2RhdGEtPmRldnR5cGUgPT0gSU1YNlVMX0VDU1BJKQo+ICsJCXR4X3dtbCA9IHNw aV9pbXgtPndtbDsKClRoaXMgaWYgY2xhdXNlIGhhcyB0byBiZSBhZGp1c3RlZCBmb3IgZXZlcnkg bmV3IFNvQyB3aGljaCBkb2Vzbid0IGhhdmUKdGhpcyBpc3N1ZS4gQmV0dGVyIGludHJvZHVjZSBh IGhhc19lcnIwMDkxNjUgYm9vbGVhbiBmbGFnIHRvIHRoZSBkcml2ZXIKZGF0YSBhbmQgc2V0IGl0 IHdoZXJlIG5lY2Vzc2FyeS4KClNhc2NoYQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_NEOMUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C89DC282E1 for ; Wed, 24 Apr 2019 06:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 735DA218D3 for ; Wed, 24 Apr 2019 06:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729822AbfDXGc4 (ORCPT ); Wed, 24 Apr 2019 02:32:56 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:41511 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727039AbfDXGcz (ORCPT ); Wed, 24 Apr 2019 02:32:55 -0400 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hJBSU-0006pn-64; Wed, 24 Apr 2019 08:32:42 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1hJBSS-0006n1-Jx; Wed, 24 Apr 2019 08:32:40 +0200 Date: Wed, 24 Apr 2019 08:32:40 +0200 From: "s.hauer@pengutronix.de" To: Robin Gong Cc: "broonie@kernel.org" , "shawnguo@kernel.org" , "festevam@gmail.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "u.kleine-koenig@pengutronix.de" , "plyatov@gmail.com" , "sean.nyekjaer@prevas.dk" , dl-linux-imx , "linux-spi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "dmaengine@vger.kernel.org" , "devicetree@vger.kernel.org" , "kernel@pengutronix.de" Subject: Re: [PATCH v1 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Message-ID: <20190424063240.vr5in5nez6hl2zgr@pengutronix.de> References: <1556027045-5269-1-git-send-email-yibin.gong@nxp.com> <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:30:46 up 36 days, 17:41, 80 users, load average: 1.48, 1.38, 1.32 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dmaengine@vger.kernel.org Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Message-ID: <20190424063240.vn2hI8Pb7w7DGF0rDhK5HQVygAzt8lokNGVnAWEDu1E@z> On Tue, Apr 23, 2019 at 01:51:10PM +0000, Robin Gong wrote: > 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 > --- > 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; This if clause has to be adjusted for every new SoC which doesn't have this issue. Better introduce a has_err009165 boolean flag to the driver data and set it where necessary. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | From mboxrd@z Thu Jan 1 00:00:00 1970 From: "s.hauer@pengutronix.de" Subject: Re: [PATCH v1 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Wed, 24 Apr 2019 08:32:40 +0200 Message-ID: <20190424063240.vr5in5nez6hl2zgr@pengutronix.de> References: <1556027045-5269-1-git-send-email-yibin.gong@nxp.com> <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> Sender: linux-kernel-owner@vger.kernel.org To: Robin Gong Cc: "broonie@kernel.org" , "shawnguo@kernel.org" , "festevam@gmail.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "u.kleine-koenig@pengutronix.de" , "plyatov@gmail.com" , "sean.nyekjaer@prevas.dk" , dl-linux-imx , "linux-spi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "dmaengine@vger.kernel.org" , "devicetree@vger.kernel.org" , "kernel@pengutronix.de" List-Id: devicetree@vger.kernel.org On Tue, Apr 23, 2019 at 01:51:10PM +0000, Robin Gong wrote: > 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 > --- > 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; This if clause has to be adjusted for every new SoC which doesn't have this issue. Better introduce a has_err009165 boolean flag to the driver data and set it where necessary. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | From mboxrd@z Thu Jan 1 00:00:00 1970 From: "s.hauer@pengutronix.de" Subject: Re: [PATCH v1 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Date: Wed, 24 Apr 2019 08:32:40 +0200 Message-ID: <20190424063240.vr5in5nez6hl2zgr@pengutronix.de> References: <1556027045-5269-1-git-send-email-yibin.gong@nxp.com> <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "broonie@kernel.org" , "shawnguo@kernel.org" , "festevam@gmail.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" , "u.kleine-koenig@pengutronix.de" , "plyatov@gmail.com" , "sean.nyekjaer@prevas.dk" , dl-linux-imx , "linux-spi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "dmaengine@vger.kernel.org" , "devicetree@vger.kernel.org" , "kernel@pengutronix.de" Return-path: Content-Disposition: inline In-Reply-To: <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org On Tue, Apr 23, 2019 at 01:51:10PM +0000, Robin Gong wrote: > 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 > --- > 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; This if clause has to be adjusted for every new SoC which doesn't have this issue. Better introduce a has_err009165 boolean flag to the driver data and set it where necessary. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_NEOMUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FD69C10F11 for ; Wed, 24 Apr 2019 06:33:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0545B218D3 for ; Wed, 24 Apr 2019 06:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DZ5UF8Fc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0545B218D3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aep67p2DsQg57V9OsDRbqRUsoqT9ZvocQz7U5q52aec=; b=DZ5UF8FcWcUnxt Q5kU/hl+ZJxFoeiRSEh34BjczQ+dYEHVhjT6NxQPC1NOSlDz4T3Cs+/m8NtYwQTR4wgUg9JauoUKx UEwbgAdm+MiWvqySAyu4M24BP02Se+stKKrkodKeBZYrLdOAba/ZeL21BFHIwhE1Kf02w2LZTedqM eqYLVDch3rLS7BKEE6N+giP6maOG5XrnsxY/RzLP8k8hvsBR1M6JxzIhq0Pb3CR1xIZn2dVa7Y5GQ +r9y0d+ez5Z7Be2ZRlVVO5pJlmlSldVIqQbKfI9PRQY8WkExtRfaftsqO6W/koEzFWvc1erKWA/PY Kbu1yraPLjTEFJHCF2pA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJBSh-0006PZ-QX; Wed, 24 Apr 2019 06:32:55 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJBSe-0006PA-4Z for linux-arm-kernel@lists.infradead.org; Wed, 24 Apr 2019 06:32:54 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hJBSU-0006pn-64; Wed, 24 Apr 2019 08:32:42 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1hJBSS-0006n1-Jx; Wed, 24 Apr 2019 08:32:40 +0200 Date: Wed, 24 Apr 2019 08:32:40 +0200 From: "s.hauer@pengutronix.de" To: Robin Gong Subject: Re: [PATCH v1 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Message-ID: <20190424063240.vr5in5nez6hl2zgr@pengutronix.de> References: <1556027045-5269-1-git-send-email-yibin.gong@nxp.com> <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1556027045-5269-8-git-send-email-yibin.gong@nxp.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 08:30:46 up 36 days, 17:41, 80 users, load average: 1.48, 1.38, 1.32 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190423_233252_341108_325C13F5 X-CRM114-Status: GOOD ( 22.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "mark.rutland@arm.com" , "devicetree@vger.kernel.org" , "sean.nyekjaer@prevas.dk" , "shawnguo@kernel.org" , "plyatov@gmail.com" , "linux-kernel@vger.kernel.org" , "robh+dt@kernel.org" , "linux-spi@vger.kernel.org" , "broonie@kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "u.kleine-koenig@pengutronix.de" , "dmaengine@vger.kernel.org" , "festevam@gmail.com" , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Apr 23, 2019 at 01:51:10PM +0000, Robin Gong wrote: > 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 > --- > 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; This if clause has to be adjusted for every new SoC which doesn't have this issue. Better introduce a has_err009165 boolean flag to the driver data and set it where necessary. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel