From patchwork Tue Oct 6 10:27:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 7334341 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D3701BEEA4 for ; Tue, 6 Oct 2015 10:27:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE1E520619 for ; Tue, 6 Oct 2015 10:27:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AC5E2061F for ; Tue, 6 Oct 2015 10:27:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbbJFK1s (ORCPT ); Tue, 6 Oct 2015 06:27:48 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:36216 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934AbbJFK1s (ORCPT ); Tue, 6 Oct 2015 06:27:48 -0400 Received: by lbcao8 with SMTP id ao8so73502112lbc.3 for ; Tue, 06 Oct 2015 03:27:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/qPr6eGkBFWUz+9YXh0Y31sb80SITWY60GJoiILT0Ns=; b=KzN6Zvr+PcdTOv1S+JjdO8x5WTDbcyTLXkRAPVuc26hPugEGHzGhi0sT58Qr8QasCp TWPloyCY7f41LvZtKpIfJy1s5h9OFfQWzVFIJWtbw+Nb5ALDCD99ZFpiUWcKGYIzzUD6 pq32xoxuH34IqzVog1A1LeqkKZrMmOVwp/XXW4uZ5v2K8FHKLFDKsG31XvFTNLuU5Yll UMk0x64l8JkiaoLxxfED2OLx3mIxlddejOH35cIIgqQiNS9oEXgGlEXEw5FxXpLPitYe rYyJgGiDp4kCwKP6bOGOcYw2KoposocVVYSdAoQIZANzrfmzeoExJ9HlrEuZ7QVIpzkz vyBA== X-Gm-Message-State: ALoCoQmb+sQYrocu9MGhgBS0/A3iaMuDsL0sxw45bIS4JRvHaL8BF82+ZSZ19Ag4tyS01pmsn1LL X-Received: by 10.25.165.84 with SMTP id o81mr9484014lfe.80.1444127266967; Tue, 06 Oct 2015 03:27:46 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id jb10sm5069149lbc.46.2015.10.06.03.27.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 03:27:46 -0700 (PDT) From: Linus Walleij To: Vinod Koul , dmaengine@vger.kernel.org, Joachim Eastwood Cc: Linus Walleij Subject: [PATCH 3/3] ARM: nomadik: add DMA engine and some channels Date: Tue, 6 Oct 2015 12:27:38 +0200 Message-Id: <1444127258-742-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the DMA engine to the Nomadik and assigns the UART DMA channels. Both slave DMA for UARTs and the memcpy engine works fine, tested on the Nomadik NHK15. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index 314f59c12162..05f377baf852 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -756,6 +756,11 @@ clocks = <&uart0clk>, <&pclkuart0>; clock-names = "uartclk", "apb_pclk"; status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&uart0_default_mux>; + dmas = <&dmac0 14 1>, + <&dmac0 15 1>; + dma-names = "rx", "tx"; }; uart1: uart@101fb000 { @@ -767,6 +772,9 @@ clock-names = "uartclk", "apb_pclk"; pinctrl-names = "default"; pinctrl-0 = <&uart1_default_mux>; + dmas = <&dmac1 22 1>, + <&dmac1 23 1>; + dma-names = "rx", "tx"; }; uart2: uart@101f2000 { @@ -777,6 +785,9 @@ clocks = <&uart2clk>, <&pclkuart2>; clock-names = "uartclk", "apb_pclk"; status = "disabled"; + dmas = <&dmac1 30 1>, + <&dmac1 31 1>; + dma-names = "rx", "tx"; }; rng: rng@101b0000 { @@ -810,5 +821,34 @@ pinctrl-0 = <&mmcsd_default_mux>, <&mmcsd_default_mode>; vmmc-supply = <&vmmc_regulator>; }; + + dmac0: dma-controller@10130000 { + compatible = "arm,pl080", "arm,primecell"; + reg = <0x10130000 0x1000>; + interrupt-parent = <&vica>; + interrupts = <15>; + clocks = <&hclkdma0>; + clock-names = "apb_pclk"; + lli-bus-interface-ahb1; + lli-bus-interface-ahb2; + mem-bus-interface-ahb2; + memcpy-burst-size = <256>; + memcpy-bus-width = <32>; + #dma-cells = <2>; + }; + dmac1: dma-controller@10150000 { + compatible = "arm,pl080", "arm,primecell"; + reg = <0x10150000 0x1000>; + interrupt-parent = <&vica>; + interrupts = <13>; + clocks = <&hclkdma1>; + clock-names = "apb_pclk"; + lli-bus-interface-ahb1; + lli-bus-interface-ahb2; + mem-bus-interface-ahb2; + memcpy-burst-size = <256>; + memcpy-bus-width = <32>; + #dma-cells = <2>; + }; }; };