From patchwork Tue Jan 24 09:58:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9534709 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 64BAF60434 for ; Tue, 24 Jan 2017 09:59:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 594BF25D99 for ; Tue, 24 Jan 2017 09:59:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E11926B41; Tue, 24 Jan 2017 09:59:13 +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_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 EF93726907 for ; Tue, 24 Jan 2017 09:59:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750732AbdAXJ7D (ORCPT ); Tue, 24 Jan 2017 04:59:03 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:36573 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbdAXJ66 (ORCPT ); Tue, 24 Jan 2017 04:58:58 -0500 Received: by mail-wm0-f54.google.com with SMTP id c85so172757506wmi.1 for ; Tue, 24 Jan 2017 01:58:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vlWHX391xmTVKqikPIvcpUxAKp5ApwIa+W98cCpnQ4c=; b=0lw+T9PzEI09MMzTtKPYVfn587s1Gpb0YSDEPGAqrPtEtv/Ba8BrwtYiQPxUBCu0rb ruxWXyM9z6IXb3A08UIjPCp0biVbsHybJfHDhAKaWas1mRmu1oVY6uJJzvN18COrX95+ pSh8+s/Q2usLf4smSnOlnzjwqJRTj2zr9ebahcpFTYHZUabpx1NNX1evJdmZqN0KibY7 HKVYM/qPmCjDa2C1Cw+c7w96Wn44qFdJpkobraxpwTNq2Vy3pPR8BAZCf18GDQlBi1Dg t3o2xo3Peoo0kcvXYb95cJqnQGF657vgnEMkeaEq8h0WwQ/7qj9HURi/CZDxbN+ATzXm 2ujQ== 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:in-reply-to :references; bh=vlWHX391xmTVKqikPIvcpUxAKp5ApwIa+W98cCpnQ4c=; b=RJtv+hINrEfQ0dhnMVyq1ZqcDvgGCMjCTNpDHbTo0rkluLNtaFAXZY7sPFx60EfcVM 1/UHKw8dkUER5JmlG3mPeYMEHEKZWs5CZSnPbCuTf/zEHRdms+CEQfeKgbsfs4ZEbBwP IHRrbxbwGYF/t6JprSei0vmIU+lJAOYgZ5CptoaiutGueHUH4DfFpZMak8YUakLGB1tG BiDQSHbFGlc2OCcaogheHr8s2y88qlRGx1sAFnvvo4JQX+8PNNM/rXZ+va41fP0j4cHM i/IcMJsJAPUNSDIr13xuJ57sxwssyaawVikvZfIITXMyqbyfcVxqJhN8cXNJQQdLTm8M Jr/Q== X-Gm-Message-State: AIkVDXIDIqrgWgxOVQ1Y9W9XFmXw1ZQOCKmwia/V3GIXyLjOyTLzr26Jl5Wtj6GN5NEygUFa X-Received: by 10.28.217.136 with SMTP id q130mr15907481wmg.13.1485251937391; Tue, 24 Jan 2017 01:58:57 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id l10sm16243815wrb.44.2017.01.24.01.58.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jan 2017 01:58:56 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, b-liu@ti.com, sergei.shtylyov@cogentembedded.com, devicetree@vger.kernel.org, robh+dt@kernel.org, Alexandre Bailon Subject: [PATCH v3 2/3] dmaengine: cppi41: Add support of DA8xx to CPPI 4.1 Date: Tue, 24 Jan 2017 10:58:47 +0100 Message-Id: <20170124095848.14593-3-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170124095848.14593-1-abailon@baylibre.com> References: <20170124095848.14593-1-abailon@baylibre.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DA8xx has a CPPI 4.1 DMA controller. This is add the glue layer required to make it work on DA8xx. Signed-off-by: Alexandre Bailon --- drivers/dma/Kconfig | 6 +++--- drivers/dma/cppi41.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 0d6a96e..2a31e1a 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -514,12 +514,12 @@ config TIMB_DMA Enable support for the Timberdale FPGA DMA engine. config TI_CPPI41 - tristate "AM33xx CPPI41 DMA support" - depends on ARCH_OMAP + tristate "CPPI 4.1 DMA support" + depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) select DMA_ENGINE help The Communications Port Programming Interface (CPPI) 4.1 DMA engine - is currently used by the USB driver on AM335x platforms. + is currently used by the USB driver on AM335x and DA8xx platforms. config TI_DMA_CROSSBAR bool diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index 21a4f79..5c501da 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -221,6 +221,20 @@ static const struct chan_queues am335x_usb_queues_rx[] = { [29] = { .submit = 30, .complete = 155}, }; +static const struct chan_queues da8xx_usb_queues_tx[] = { + [0] = { .submit = 16, .complete = 24}, + [1] = { .submit = 18, .complete = 24}, + [2] = { .submit = 20, .complete = 24}, + [3] = { .submit = 22, .complete = 24}, +}; + +static const struct chan_queues da8xx_usb_queues_rx[] = { + [0] = { .submit = 1, .complete = 26}, + [1] = { .submit = 3, .complete = 26}, + [2] = { .submit = 5, .complete = 26}, + [3] = { .submit = 7, .complete = 26}, +}; + struct cppi_glue_infos { const struct chan_queues *queues_rx; const struct chan_queues *queues_tx; @@ -949,8 +963,17 @@ static const struct cppi_glue_infos am335x_usb_infos = { .qmgr_num_pend = 5, }; +static const struct cppi_glue_infos da8xx_usb_infos = { + .queues_rx = da8xx_usb_queues_rx, + .queues_tx = da8xx_usb_queues_tx, + .td_queue = { .submit = 31, .complete = 0 }, + .first_completion_queue = 24, + .qmgr_num_pend = 2, +}; + static const struct of_device_id cppi41_dma_ids[] = { { .compatible = "ti,am3359-cppi41", .data = &am335x_usb_infos}, + { .compatible = "ti,da830-cppi41", .data = &da8xx_usb_infos}, {}, }; MODULE_DEVICE_TABLE(of, cppi41_dma_ids);