From patchwork Thu Jan 5 06:10:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 9498469 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 5C81360235 for ; Thu, 5 Jan 2017 06:12:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48AE227F8D for ; Thu, 5 Jan 2017 06:12:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CE4F27FA3; Thu, 5 Jan 2017 06:12:51 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 E444327F8D for ; Thu, 5 Jan 2017 06:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758096AbdAEGLC (ORCPT ); Thu, 5 Jan 2017 01:11:02 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:51314 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754288AbdAEGKL (ORCPT ); Thu, 5 Jan 2017 01:10:11 -0500 Received: from svr-orw-fem-06.mgc.mentorg.com ([147.34.97.120]) by relay1.mentorg.com with esmtp id 1cP1Fa-00036V-An from Jiada_Wang@mentor.com ; Wed, 04 Jan 2017 22:10:10 -0800 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft SMTP Server id 14.3.224.2; Wed, 4 Jan 2017 22:10:09 -0800 From: Jiada Wang To: , , CC: , , , Subject: [PATCH 1/1] spi: imx: support to set watermark level via DTS Date: Thu, 5 Jan 2017 15:10:15 +0900 Message-ID: <20170105061015.7816-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 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 Previously watermark level is configured to fifosize/2, DMA mode can be used only when transfer length can be divided by 'watermark level * bpw', which makes DMA mode not practical. This patch adds new DTS property 'dma-wml', user can configure DMA watermark level, by specify 'dma-wml' in corresponding ecspi node. Signed-off-by: Jiada Wang --- Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt | 2 ++ drivers/spi/spi-imx.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt index 8bc95e2..1e9345f 100644 --- a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt +++ b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt @@ -19,6 +19,7 @@ See the clock consumer binding, - dmas: DMA specifiers for tx and rx dma. See the DMA client binding, Documentation/devicetree/bindings/dma/dma.txt - dma-names: DMA request names should include "tx" and "rx" if present. +- dma-wml: Specifies DMA watermark level Obsolete properties: - fsl,spi-num-chipselects : Contains the number of the chipselect @@ -35,4 +36,5 @@ ecspi@70010000 { <&gpio3 25 0>; /* GPIO3_25 */ dmas = <&sdma 3 7 1>, <&sdma 4 7 2>; dma-names = "rx", "tx"; + dma-wml = <16>; }; diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index deb782f..5c0ce19 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -929,8 +929,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, if (of_machine_is_compatible("fsl,imx6dl")) return 0; - spi_imx->wml = spi_imx_get_fifosize(spi_imx) / 2; - /* Prepare for TX DMA: */ master->dma_tx = dma_request_slave_channel_reason(dev, "tx"); if (IS_ERR(master->dma_tx)) { @@ -1155,6 +1153,7 @@ static int spi_imx_probe(struct platform_device *pdev) struct spi_imx_data *spi_imx; struct resource *res; int i, ret, irq; + u32 wml; if (!np && !mxc_platform_info) { dev_err(&pdev->dev, "can't get the platform data\n"); @@ -1177,6 +1176,15 @@ static int spi_imx_probe(struct platform_device *pdev) spi_imx->devtype_data = of_id ? of_id->data : (struct spi_imx_devtype_data *)pdev->id_entry->driver_data; + if (of_property_read_u32(np, "dma-wml", &wml) == 0) { + if (wml > spi_imx_get_fifosize(spi_imx) || wml == 0) { + dev_warn(&pdev->dev, "mis-configured dma-wml\n"); + spi_imx->wml = spi_imx_get_fifosize(spi_imx) / 2; + } else + spi_imx->wml = wml; + } else + spi_imx->wml = spi_imx_get_fifosize(spi_imx) / 2; + if (mxc_platform_info) { master->num_chipselect = mxc_platform_info->num_chipselect; master->cs_gpios = devm_kzalloc(&master->dev,