From patchwork Sun Aug 13 12:04:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9897745 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 F3D5560244 for ; Sun, 13 Aug 2017 12:04:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E651B201B1 for ; Sun, 13 Aug 2017 12:04:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAC3B28488; Sun, 13 Aug 2017 12:04:38 +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 505B7201B1 for ; Sun, 13 Aug 2017 12:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752421AbdHMMEd (ORCPT ); Sun, 13 Aug 2017 08:04:33 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38075 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751420AbdHMMEb (ORCPT ); Sun, 13 Aug 2017 08:04:31 -0400 Received: by mail-wm0-f44.google.com with SMTP id f15so23984930wmg.1 for ; Sun, 13 Aug 2017 05:04:30 -0700 (PDT) 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=1bOXA+7xpb6vaLL1i8pyuT3jeqge/wvNT0YPx6sG0OU=; b=dBTuDfaoVnKFzjgFcyipzis4PNPkkS+CSc2IraQS7dyuMmNi+oXi7I5fplRSuFFJTb oOH/XPapQTOJ1pFJZAnNPfe5zq3hNSzbvjkGVp0AP81EvnLlQokwYkB2yRH8ER8wcG6s DiFo/V70ZqKT9njPmP+BSCueQwQRX1OSu3AYFD3g1BA8Nj4JIZHQmaRYLzIsM8La8IwK sLhYJvarzuXrEI/lR0ZqzWVHckR1NCElM9l4eaDFJ4FKlWTv/tBJr2w7DY536uUDmJnJ HDTDS7jVwkZ0+3rqCGXTjbEYufPjD9e1FbiQzSKY9FCUAJ5SIzzsjP2oAVOa556OV/De aQhQ== 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=1bOXA+7xpb6vaLL1i8pyuT3jeqge/wvNT0YPx6sG0OU=; b=dLBhQiZ6LrQb4IlEJRZFcLlqmp9H2oqsCz1MCyieORmfZEnIwxwoSTGxCnuditK2w+ 7stoRrl1fAKqAmjxXTFHQP+JALk4UtAwqG1QHWISHHE2UIHITBDONrJ29NZ+Qiv39TWa KoSfJuDo0njj0UaMKRxQGEW6gG0Pw4uJeBLTjBNXOHrKXdhxFmhUO1knNGHBGVEyg8fB hr9jBFX9yHCThXEt95DzBjgdw5fD9M3lDyUPR/9RTqldSM9lb5Nu16rJ/tcDPr7sSkgr 6KGRVyw3kvkVIigs/p4oFubjyyo/K+pQxZFQQcEKA1gEKZb+h0imhgmkUDvplDz58zVO uKtg== X-Gm-Message-State: AHYfb5ifcyAcxFbalUBFfZ8WnXZP7J0I8C6HeOGYjwsdfQ7VKM+H/ugG ujsefEylCmhw4fSh X-Received: by 10.28.61.4 with SMTP id k4mr2238783wma.146.1502625870213; Sun, 13 Aug 2017 05:04:30 -0700 (PDT) Received: from localhost.localdomain (car75-h02-176-137-58-115.dsl.sta.abo.bbox.fr. [176.137.58.115]) by smtp.gmail.com with ESMTPSA id 125sm3383084wmk.6.2017.08.13.05.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 13 Aug 2017 05:04:29 -0700 (PDT) From: Alexandre Bailon To: b-liu@ti.com Cc: linux-usb@vger.kernel.org, nsekhar@ti.com, ptitiano@baylibre.com, sergei.shtylyov@cogentembedded.com, linux-omap@vger.kernel.org, Alexandre Bailon Subject: [PATCH 1/2] usb: musb: musb_cppi41: Fix the address of teardown and autoreq registers Date: Sun, 13 Aug 2017 14:04:22 +0200 Message-Id: <20170813120423.16371-2-abailon@baylibre.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170813120423.16371-1-abailon@baylibre.com> References: <20170813120423.16371-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 and DSPS platforms don't use the same address for few registers. On Da8xx, this is causing some issues (e.g. teardown that doesn't work). Configure the address of the register during the init and use them instead of constants. Reported-by: nsekhar@ti.com Signed-off-by: Alexandre Bailon Reported-by: Sekhar Nori Tested-by: Sekhar Nori --- drivers/usb/musb/musb_cppi41.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c index ba255280a624..dbff0e0a4ff5 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -26,6 +26,9 @@ #define MUSB_DMA_NUM_CHANNELS 15 +#define DA8XX_USB_AUTOREQ_REG 0x14 +#define DA8XX_USB_TEARDOWN_REG 0x1c + struct cppi41_dma_controller { struct dma_controller controller; struct cppi41_dma_channel rx_channel[MUSB_DMA_NUM_CHANNELS]; @@ -35,6 +38,9 @@ struct cppi41_dma_controller { u32 rx_mode; u32 tx_mode; u32 auto_req; + + u32 tdown_reg; + u32 autoreq_reg; }; static void save_rx_toggle(struct cppi41_dma_channel *cppi41_channel) @@ -364,8 +370,8 @@ static void cppi41_set_autoreq_mode(struct cppi41_dma_channel *cppi41_channel, if (new_mode == old_mode) return; controller->auto_req = new_mode; - musb_writel(controller->controller.musb->ctrl_base, USB_CTRL_AUTOREQ, - new_mode); + musb_writel(controller->controller.musb->ctrl_base, + controller->autoreq_reg, new_mode); } static bool cppi41_configure_channel(struct dma_channel *channel, @@ -581,12 +587,13 @@ static int cppi41_dma_channel_abort(struct dma_channel *channel) do { if (is_tx) - musb_writel(musb->ctrl_base, USB_TDOWN, tdbit); + musb_writel(musb->ctrl_base, controller->tdown_reg, + tdbit); ret = dmaengine_terminate_all(cppi41_channel->dc); } while (ret == -EAGAIN); if (is_tx) { - musb_writel(musb->ctrl_base, USB_TDOWN, tdbit); + musb_writel(musb->ctrl_base, controller->tdown_reg, tdbit); csr = musb_readw(epio, MUSB_TXCSR); if (csr & MUSB_TXCSR_TXPKTRDY) { @@ -727,6 +734,14 @@ cppi41_dma_controller_create(struct musb *musb, void __iomem *base) controller->controller.is_compatible = cppi41_is_compatible; controller->controller.musb = musb; + if (musb->io.quirks & MUSB_DA8XX) { + controller->tdown_reg = DA8XX_USB_TEARDOWN_REG; + controller->autoreq_reg = DA8XX_USB_AUTOREQ_REG; + } else { + controller->tdown_reg = USB_TDOWN; + controller->autoreq_reg = USB_CTRL_AUTOREQ; + } + ret = cppi41_dma_controller_start(controller); if (ret) goto plat_get_fail;