From patchwork Wed Jan 25 10:33:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9536745 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 BC38E6046A for ; Wed, 25 Jan 2017 10:33:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB99E26861 for ; Wed, 25 Jan 2017 10:33:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A07AF2787C; Wed, 25 Jan 2017 10:33:43 +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=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 4830026861 for ; Wed, 25 Jan 2017 10:33:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915AbdAYKdm (ORCPT ); Wed, 25 Jan 2017 05:33:42 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38135 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695AbdAYKd3 (ORCPT ); Wed, 25 Jan 2017 05:33:29 -0500 Received: by mail-wm0-f51.google.com with SMTP id r144so22798496wme.1 for ; Wed, 25 Jan 2017 02:33:28 -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=mf6LsFmSgF0XcWMk6up9kSEt7nqoc4i7TJLbMn0tAZI=; b=dpRPLiAOPS9WyRnQ5W1PDuLL95S07KYVloP6QSDKzObYdi3VgUu+zG1WXr1RybSx2Q +tIaBbA+H9ikwaFSlI3BtD98ivwECUEw+OL7h3bVuVGf9U5TjbfCeWcOYhL/yLuDwT16 QM+L+flMDsDx3tHmu1B1vOuHmukM4047c/koY4qgujERjL4RqPQwKCxljzE/86jtAYdu YGnlPwCab5Qk540MqRD9TG2mUNcfStjsgsdrh1Pf3Vc0X5hCRXQJhDiGMZ1zxC2q64RA M8jfR6EaSeAWG4MinBv9MszCaL7x9D/bl5m7MjzjLKNgKzSpT/zOiPaJLJQxtjYkpgmM GfuQ== 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=mf6LsFmSgF0XcWMk6up9kSEt7nqoc4i7TJLbMn0tAZI=; b=IDbvuyjkYle5bsqCVi+OB4M4Yo9/N0K2PFVINJ4IwpB3Nn6qTDjYMkd6VOgZv9/ozm 33we2JDTL2FLDvhmF32cInWuxH/p9ypaIsrKTiH7i/Ry2BJPhOJcZcO3PooOLIyiEt1/ HpaPfTlBhxjJS/Ha7eKMpgA2/32M/nFq1S+yrmRQZjfDEOZFYEtGzzwEvOaCR+fuyGiD E8pVCkrVX2j/k8khb5Zv6rl7o3LTe8molzkdtK7HBiyqUBM0URxaEqF70xnmovoooh9S IWGgX1Pzs4lCg0Kn+VIzEZpqcAV7zSUgQtbzy8mQvuA5ya66xx6LAq0XQgSfwBKDaih8 h9ug== X-Gm-Message-State: AIkVDXKYMHxUkAyl8bnHdh2Nm+YeZpYZK4KGg3E3iiruZXvR4/+MQISDv/o75YEp+P1TuQEP X-Received: by 10.28.140.140 with SMTP id o134mr23713040wmd.87.1485340407485; Wed, 25 Jan 2017 02:33:27 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id z134sm30599521wmc.20.2017.01.25.02.33.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jan 2017 02:33:26 -0800 (PST) From: Alexandre Bailon To: b-liu@ti.com Cc: nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, sergei.shtylyov@cogentembedded.com, linux-usb@vger.kernel.org, Alexandre Bailon Subject: [PATCH v5 3/5] usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx Date: Wed, 25 Jan 2017 11:33:17 +0100 Message-Id: <20170125103319.26021-4-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170125103319.26021-1-abailon@baylibre.com> References: <20170125103319.26021-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 Currently, only the PIO mode is supported. This add support of CPPI 4.1 to DA8xx. As the In DA8xx the CPPI 4.1 DMA is a part of the USB. Create the CPPI 4.1 device as a child of USB. Signed-off-by: Alexandre Bailon --- drivers/usb/musb/Kconfig | 4 ++-- drivers/usb/musb/da8xx.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 72a2a50..5506a9c 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -160,8 +160,8 @@ config USB_TI_CPPI_DMA Enable DMA transfers when TI CPPI DMA is available. config USB_TI_CPPI41_DMA - bool 'TI CPPI 4.1 (AM335x)' - depends on ARCH_OMAP && DMADEVICES + bool 'TI CPPI 4.1' + depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) && DMADEVICES select TI_CPPI41 config USB_TUSB_OMAP_DMA diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index cd3d763..d279438 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -457,12 +458,40 @@ static inline u8 get_vbus_power(struct device *dev) return current_uA / 1000 / 2; } +#ifdef CONFIG_USB_TI_CPPI41_DMA +static void da8xx_dma_controller_callback(struct dma_controller *c) +{ + struct musb *musb = c->musb; + void __iomem *reg_base = musb->ctrl_base; + + musb_writel(reg_base, DA8XX_USB_END_OF_INTR_REG, 0); +} + +static struct dma_controller * +da8xx_dma_controller_create(struct musb *musb, void __iomem *base) +{ + struct dma_controller *controller; + + controller = cppi41_dma_controller_create(musb, base); + if (IS_ERR_OR_NULL(controller)) + return controller; + + controller->dma_callback = da8xx_dma_controller_callback; + + return controller; +} +#endif + static const struct musb_platform_ops da8xx_ops = { - .quirks = MUSB_INDEXED_EP, + .quirks = MUSB_INDEXED_EP | MUSB_DMA_CPPI41, .init = da8xx_musb_init, .exit = da8xx_musb_exit, .fifo_mode = 2, +#ifdef CONFIG_USB_TI_CPPI41_DMA + .dma_init = da8xx_dma_controller_create, + .dma_exit = cppi41_dma_controller_destroy, +#endif .enable = da8xx_musb_enable, .disable = da8xx_musb_disable, @@ -534,6 +563,10 @@ static int da8xx_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, glue); + ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); + if (ret) + return ret; + memset(musb_resources, 0x00, sizeof(*musb_resources) * ARRAY_SIZE(musb_resources));