From patchwork Thu Jan 19 14:08:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 91909 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp293170qgi; Thu, 19 Jan 2017 06:08:50 -0800 (PST) X-Received: by 10.98.1.213 with SMTP id 204mr10219293pfb.61.1484834930071; Thu, 19 Jan 2017 06:08:50 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h88si3674019pfk.4.2017.01.19.06.08.49; Thu, 19 Jan 2017 06:08:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752879AbdASOIq (ORCPT + 4 others); Thu, 19 Jan 2017 09:08:46 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35543 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752812AbdASOIp (ORCPT ); Thu, 19 Jan 2017 09:08:45 -0500 Received: by mail-wm0-f50.google.com with SMTP id r126so291060207wmr.0 for ; Thu, 19 Jan 2017 06:08:44 -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=MF2vD+AmRfDoJ9A5wN4h03QQtRTFk0cQlK9Ic7jndUs=; b=2HVqJB3nosdPOzCLzaPfm16d829mjGe3RWgEQqdn+dkW04c0zic6QzRjHQAqPSiihq tl1N/ivHDQwQmUU/BVgHP++il3nhCP8AlHXgr3W2rL+T8abXTM9pMTEVv0aNybvP8cDN fZ05msleJI2ifjoNEJod0TKG/aQbsvvg532hqoNevC4lKiwxCdeEbRNjg1EZLqmSRHYf QyEmv8B9jr2F87xYofEyRMFCNNH3iUOLaXg1RQsorIZ1Rps67mXt8YwpBJDEIw9XJoK5 GvlElljvIDeH9Izmkf3padZrDO953Qb+YnjwYjxR/dqmYl9h+ZQerXIlnj0iRXxbepr8 0iYw== 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=MF2vD+AmRfDoJ9A5wN4h03QQtRTFk0cQlK9Ic7jndUs=; b=ET5tuh2j3gclBrN995bEc7Q8dHN7IJcelbqDQ7xAWAfK869s27SlEvn6Mo0IFDiNZg fqmd/dkRRzeXLZNAx5/qlJ6iEnD72RI5dCsj5vDbhr+pBR4wrsMCRvEaKqbJlz6m4Lyo Bv26wuCAvhf7X/TPMkIhAvJnXQAm932V8uZCYMOU83fEsjEtNekeo3UebP1PN1duby+i ystEwqCURVO3qBkklkIVEXWWxtMreh941cI0bkWGrGunDmTfjEvv835IhPtsIX+rjRAE 6LXyn1aVMiVeQAhlzd0r2qT9Nv3CydPI5ebxI78t4wn2DWKmcVFtf8ssKdnWH/1QWXvP lT3Q== X-Gm-Message-State: AIkVDXLpg4X4wUlCHwW6kXU662yK+4gb02DwAtNgmJxnvVUfSyVPQdE+r25d780kNvOrkq44 X-Received: by 10.223.160.180 with SMTP id m49mr2430502wrm.160.1484834923561; Thu, 19 Jan 2017 06:08:43 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id d64sm53546626wmh.3.2017.01.19.06.08.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 06:08:43 -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, grygorii.strashko@ti.com, linux-usb@vger.kernel.org, Alexandre Bailon Subject: [PATCH v3 3/5] usb: musb: Add support of CPPI 4.1 DMA controller to DA8xx Date: Thu, 19 Jan 2017 15:08:33 +0100 Message-Id: <20170119140835.18981-4-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170119140835.18981-1-abailon@baylibre.com> References: <20170119140835.18981-1-abailon@baylibre.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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..5f50a78 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_DM +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));