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: 9651893 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 262CE60349 for ; Wed, 29 Mar 2017 16:10:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 197F3284F2 for ; Wed, 29 Mar 2017 16:10:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D12E28504; Wed, 29 Mar 2017 16:10:29 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 E5F91284F2 for ; Wed, 29 Mar 2017 16:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752637AbdC2QK0 (ORCPT ); Wed, 29 Mar 2017 12:10:26 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:36582 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752609AbdC2QKZ (ORCPT ); Wed, 29 Mar 2017 12:10:25 -0400 Received: by mail-wr0-f171.google.com with SMTP id w11so21118820wrc.3 for ; Wed, 29 Mar 2017 09:10:24 -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=Up5AoYPDKh5k4zvKmuFv+ECE4sEYYUMfj5w5nIR7Yv3J8BslzYGlI5HYnpgVRqHhHL u+8rq30da6isHiJLL2U3WpIG1Bkg0S2NnCjVC3pTlomPDollo+Zo1JOFmzdpcZ6FmiTq E8R4aHqvz4RbK5Sfyw2Q/rOcwj9I343x1iPX81whoWSVUDzD/bDS5CK4kynS62M9cbYQ D2sEZ9bWRIqcPPcZK4oROCEg6FqxNdL+V7opR9unGBfOroxWHt/ZxAifPUVyFAtrIivN AwuKrLXG3CiVLUuyHiiAUVHxV9nZ72TFNwk6tJENwCQaA3N2ziBfevhcgQOwXce4+Q3+ DeOQ== X-Gm-Message-State: AFeK/H0l98xqoycmmb58VQiJ6Mdd8PcjiQKDq8ajkdiU18gxTAibcZ3Fd+NL5n6z90rV0XqN 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 Cc: khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, b-liu@ti.com, sergei.shtylyov@cogentembedded.com, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, grygorii.strashko@ti.com, Alexandre Bailon 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 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 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), {} };