From patchwork Thu Apr 20 16:53:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Middelschulte X-Patchwork-Id: 9690991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7DC6C601D4 for ; Thu, 20 Apr 2017 16:53:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 796832849C for ; Thu, 20 Apr 2017 16:53:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E2B32849F; Thu, 20 Apr 2017 16:53:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0498A284AD for ; Thu, 20 Apr 2017 16:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S971327AbdDTQx1 (ORCPT ); Thu, 20 Apr 2017 12:53:27 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34476 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S971326AbdDTQx0 (ORCPT ); Thu, 20 Apr 2017 12:53:26 -0400 Received: by mail-wm0-f65.google.com with SMTP id z129so11964280wmb.1 for ; Thu, 20 Apr 2017 09:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WKn4OhHa6cCCTZT+dl9dCIiKGq1+LvOKupv9RAGEmPs=; b=AuA36Un3Su4bLrOA7Ul15yXszHe0CAFoHTvYaG2w0if75XiFZdDonuv8VvV/cqKIAf VRl+gFa1918U7rkPyINaZF7UAyOb02lt0siKJNRYEQKMqY+Wp2R60I7CLqdNJQUhTR5e ALG8+mkyjRN1A69I2y8HDadug6JKWMLYmcQGJknfmcnPWXeaUdorrT13IBc/6IWNxvHt ws97SE5jOw/6sZa/q7lzfr/QXGFisRuAFxmRZ3KC2TH/KBcxbiLUd/Ps3fBb6kYEVFSd IVmtNeR1ANnNvAKvo3dtHv8FHHJ9cDFPHkfYZ542qZf8endiwt0TiCGkrXhkIkhdPF1t p2rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WKn4OhHa6cCCTZT+dl9dCIiKGq1+LvOKupv9RAGEmPs=; b=nBJJxjtBd6gLgw6AFaWO6yhc7g8Uie+nWLB4vsu2PYkDUanC1YxoCBkEUWYRifpL7U v1qm9BPAGXPO1NWLp9SYquAhgSbTRnahSaxLtOUX/UbdiiesW+XHcC826+ndTu9zXDp9 Sz5HejyShLJoaMVJUUfemXkwbLyn+Q8x0ymnKjbxjbEydLC8URxrlWwj931lrNs05obx MOJt4YEqwpdN2CK25ZRYV1+k2X9elRwP9M5QQHRx8axrsKAHEFAqEO9ZGsIlXnTyyeRf wWI/fzz5JXdUbxe9LvQdTKzMOUan63rk4U8DhgbAYM76u3m2ywU1Oso53Pi3teu6nBZS ncBw== X-Gm-Message-State: AN3rC/7dCz/GHAvT7KYKXtjBZjrr8LiIZSbMc4iA580cSTy50gSNqQ3B q1rqwwK40YnaDQ== X-Received: by 10.28.188.85 with SMTP id m82mr4122160wmf.79.1492707204708; Thu, 20 Apr 2017 09:53:24 -0700 (PDT) Received: from UML026.umk.kls.zentral ([2a02:8071:b691:ae00:e6b3:18ff:fe0a:8106]) by smtp.gmail.com with ESMTPSA id z84sm24331992wmh.27.2017.04.20.09.53.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 09:53:23 -0700 (PDT) From: Leif Middelschulte X-Google-Original-From: Leif Middelschulte To: broonie@kernel.org Cc: linux-spi@vger.kernel.org, Leif Middelschulte Subject: [PATCH] spi-imx: Implements handling of the SPI_READY mode flag. Date: Thu, 20 Apr 2017 18:53:22 +0200 Message-Id: <20170420165322.4356-1-Leif.Middelschulte@gmail.com> X-Mailer: git-send-email 2.12.2 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Leif Middelschulte This patch implements consideration of the SPI_READY mode flag as defined in spi.h. It extends the device tree bindings to support the values defined by the reference manual for the DRCTL field. Thus supporting edge-triggered and level-triggered bursts. Signed-off-by: Leif Middelschulte --- .../devicetree/bindings/spi/fsl-imx-cspi.txt | 5 +++++ drivers/spi/spi-imx.c | 24 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt index 523341a0e113..52336558a121 100644 --- a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt +++ b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt @@ -21,6 +21,10 @@ See the clock consumer binding, Documentation/devicetree/bindings/dma/dma.txt - dma-names: DMA request names should include "tx" and "rx" if present. +Optional properties: +- fsl,spi-drctl: Integer, representing the value of DRCTL. Note that to +enable the DRCTL consideration, the SPI_READY mode-flag needs to be set. + Example: ecspi@70010000 { @@ -34,4 +38,5 @@ ecspi@70010000 { <&gpio3 25 0>; /* GPIO3_25 */ dmas = <&sdma 3 7 1>, <&sdma 4 7 2>; dma-names = "rx", "tx"; + fsl,spi-drctl = <1>; }; diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index f0b10219ee63..95f22dd7aa8b 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -92,6 +92,7 @@ struct spi_imx_data { struct clk *clk_per; struct clk *clk_ipg; unsigned long spi_clk; + unsigned int spi_drctl; unsigned int count; void (*tx)(struct spi_imx_data *); @@ -213,6 +214,7 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, #define MX51_ECSPI_CTRL_XCH (1 << 2) #define MX51_ECSPI_CTRL_SMC (1 << 3) #define MX51_ECSPI_CTRL_MODE_MASK (0xf << 4) +#define MX51_ECSPI_CTRL_DRCTL(drctl) ((drctl) << 16) #define MX51_ECSPI_CTRL_POSTDIV_OFFSET 8 #define MX51_ECSPI_CTRL_PREDIV_OFFSET 12 #define MX51_ECSPI_CTRL_CS(cs) ((cs) << 18) @@ -324,6 +326,12 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx, */ ctrl |= MX51_ECSPI_CTRL_MODE_MASK; + /* + * Enable SPI_RDY handling (falling edge/level triggered). + */ + if (config->mode & SPI_READY) + ctrl |= MX51_ECSPI_CTRL_DRCTL(spi_imx->spi_drctl); + /* set clock speed */ ctrl |= mx51_ecspi_clkdiv(spi_imx->spi_clk, config->speed_hz, &clk); @@ -1089,13 +1097,22 @@ static int spi_imx_probe(struct platform_device *pdev) struct spi_master *master; struct spi_imx_data *spi_imx; struct resource *res; - int i, ret, num_cs, irq; + int i, ret, num_cs, irq, spi_drctl; if (!np && !mxc_platform_info) { dev_err(&pdev->dev, "can't get the platform data\n"); return -EINVAL; } + ret = of_property_read_u32(np, "fsl,spi-drctl", &spi_drctl); + if ((ret < 0) || (spi_drctl == 0x3)) { + // '11' is reserved + spi_drctl = 0; + } else { + // only the values '00', '01' and '11' are valid + spi_drctl &= 0x3; + } + ret = of_property_read_u32(np, "fsl,spi-num-chipselects", &num_cs); if (ret < 0) { if (mxc_platform_info) @@ -1142,7 +1159,10 @@ static int spi_imx_probe(struct platform_device *pdev) spi_imx->bitbang.master->cleanup = spi_imx_cleanup; spi_imx->bitbang.master->prepare_message = spi_imx_prepare_message; spi_imx->bitbang.master->unprepare_message = spi_imx_unprepare_message; - spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; + spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH + | SPI_READY; + + spi_imx->spi_drctl = spi_drctl; init_completion(&spi_imx->xfer_done);