From patchwork Wed Mar 29 16:09:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9651895 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 9380E60349 for ; Wed, 29 Mar 2017 16:10:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 849DC284F2 for ; Wed, 29 Mar 2017 16:10:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7779F28504; Wed, 29 Mar 2017 16:10:57 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0511E284F2 for ; Wed, 29 Mar 2017 16:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=GYPJ4m/Taqef4DhubsN+rMm8zMA5nkUi3MNekUQh6dc=; b=lzR OSuJEJe0+m+XCEYyPKvwWqI7qtD+pGGEek6fe+Uoy63OGJDihVgLoAJdLz6BMQPWVvqoLd8UrJKdH jjmLsk+7kdIVKxS8BmwMO/c33g5mIRibA+tdssesogIXGSQ8I4MepeACvIc6zGOrrV4/y7Fu2S8Ka QSZbQ0LWhBc5RrfHeOdEzAYJ5ZHZ98jJZmeQ8ShcOAQ9PTAV414wqtvm/FoTZB4iX13WAnZmU4H8+ pWKYFaNkErylOMfd2yS2owqj43I6S6YdlPwH/+uVm/WoEc4yi6hOV3wANTCROFOMbbjTavbWYbAk4 r2ebiJpLpg6AmXuxf4f6w0N53scosaw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ctGBO-00007N-TY; Wed, 29 Mar 2017 16:10:50 +0000 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ctGBJ-0008Vs-QC for linux-arm-kernel@lists.infradead.org; Wed, 29 Mar 2017 16:10:49 +0000 Received: by mail-wr0-x233.google.com with SMTP id w43so21864385wrb.0 for ; Wed, 29 Mar 2017 09:10:25 -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; bh=XIYFOZ1ROElI0hgVyLCBcjUt23TsldUd+foLl/S25+8=; b=nvdp2WdsPW2Amhr5BvMdMT4nLVFzYFYPCYBJYOApPDZRgR/eHIy4DG/y9FsaJpzplC 6lr1zpA/eX0YmpXJOGk93MSlsynIajSc+5jnCmXmBo8/Xth9vUtMtuMYhyyuj3x6t3/D QsTXg2a5rNrJSOwIrJqXLtshkb8uJMEDnCRhCPLY0u8ohf0ULTBSoB3juSa4RoG5H5to gMx9YPd98XlFQu5vWwz5xuRwhm0zeNJtOlsB1x0ACay45VFVJlcf5Nwf7AzTGIy0D/lk uMh3A2/YEtj8130jjEe4I1SqTKXw/ckFMq+rnwKaUNMDXudc87XhrMW4+VfJAF91Ylur NcrA== 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; bh=XIYFOZ1ROElI0hgVyLCBcjUt23TsldUd+foLl/S25+8=; b=krkP3MNNQ0A8JUjnpLAVtFOwaiJavVfWLFyqankoK311kZ418raTzpFTDOqRyd7giu us3kYzv0znM9r6FPiIs/6FJuHPYTh0juKpo8H7Ipwf+rcYTzf8uYWJsEGMcyB0KRmT96 3xlj/Etoz/udbUS2v2l5m6GTBRHx6ouBwQqJta2ZSTTDJY/9AVaBCpUIYcPoYtFi4oq7 aOYO28inpUw7Z7htxK+CmbjXYG3iAcJxXcM7hroEP85m5d7OjwufFDFXlPmhFWEPJf58 4QGCy+YKTq8QkDVt1zp/wf4YBOUEzz70RX2c8Kx78lRSNZdlUeuPMe861AGSvINonBMD o9nw== X-Gm-Message-State: AFeK/H0Rg/nEtmaSJdzT9hHYx7wrcmaNAhH2zauHuPKLFD+aWvXnKIaDPdFErzSEiR7jw9+C X-Received: by 10.28.232.138 with SMTP id f10mr1459259wmi.59.1490803823321; Wed, 29 Mar 2017 09:10:23 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id t16sm3116916wra.56.2017.03.29.09.10.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Mar 2017 09:10:22 -0700 (PDT) From: Alexandre Bailon To: nsekhar@ti.com Subject: [PATCH] ARM: davinci: Add the clock for the CPPI 4.1 DMA engine Date: Wed, 29 Mar 2017 18:09:32 +0200 Message-Id: <20170329160932.27157-1-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170329_091046_544925_4F29B1FB X-CRM114-Status: GOOD ( 11.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: grygorii.strashko@ti.com, sergei.shtylyov@cogentembedded.com, tony@atomide.com, khilman@baylibre.com, linux-usb@vger.kernel.org, Alexandre Bailon , ptitiano@baylibre.com, linux-omap@vger.kernel.org, b-liu@ti.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The CPPI 4.1 DMA is sharing its clock with the USB OTG, and most of the time, the clock will be enabled by USB. But during the init of the DMA, USB is not enabled (waiting for DMA), and then we must enable the clock before to do anything. Add the clock for the CPPI 4.1 DMA engine. Note: This patch is to apply instead of: "ARM: davinci: Make the usb20 clock available to PM runtime" Signed-off-by: Alexandre Bailon --- arch/arm/mach-davinci/da830.c | 1 + arch/arm/mach-davinci/da850.c | 1 + arch/arm/mach-davinci/da8xx-dt.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 073c458..ae4a8a5 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -413,6 +413,7 @@ static struct clk_lookup da830_clks[] = { CLK("davinci-mcasp.1", NULL, &mcasp1_clk), CLK("davinci-mcasp.2", NULL, &mcasp2_clk), CLK("musb-da8xx", "usb20", &usb20_clk), + CLK("cppi41-dmaengine", NULL, &usb20_clk), CLK(NULL, "aemif", &aemif_clk), CLK(NULL, "aintc", &aintc_clk), CLK(NULL, "secu_mgr", &secu_mgr_clk), diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index ccad2f9..9739aaa 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -560,6 +560,7 @@ static struct clk_lookup da850_clks[] = { CLK("davinci-nand.0", "aemif", &aemif_nand_clk), CLK("ohci-da8xx", "usb11", &usb11_clk), CLK("musb-da8xx", "usb20", &usb20_clk), + CLK("cppi41-dmaengine", NULL, &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk), CLK("spi_davinci.1", NULL, &spi1_clk), CLK("vpif", NULL, &vpif_clk), diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index e3cef50..5bf08ba 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -53,6 +53,8 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("ti,da830-musb", 0x01e00000, "musb-da8xx", NULL), OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL), OF_DEV_AUXDATA("ti,da850-ahci", 0x01e18000, "ahci_da850", NULL), + OF_DEV_AUXDATA("ti,da830-cppi41", 0x01e01000, "cppi41-dma-engine", + NULL), {} };