From patchwork Tue Jan 22 13:20:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "(Exiting) Baolin Wang" X-Patchwork-Id: 10775491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 428C014E5 for ; Tue, 22 Jan 2019 13:21:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F15929066 for ; Tue, 22 Jan 2019 13:21:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22C342A0DB; Tue, 22 Jan 2019 13:21:49 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 B8ECD29066 for ; Tue, 22 Jan 2019 13:21:48 +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=XITe0xF2ZVxHNNE+Axj4kqkU89I0n9ELVsHZwGjdtRk=; b=ZO2 DW3JrdRiQ6zUzanv1+H4PtDNPN0fPSc77E2Td09nYRed+bAWyUYWk7aoHizVC1CxIktkF/mOtaewJ e861SErARNEd/MFgdE1EoIWplon1l0yio9ThkchgmQsit7+2pdyIRU/Gun7wQlAxOB7C/mUPjHUcf +Ox2xFdjEq3gig29r+LqVg/uONFkzld7ek79Q/jDPCAgauxq8td0KVHtyxaN2evEwImxqHWwLrjAX u8ANwYR7I+KQLxhRMobTsIesucRsCSNn2JWLPm7oazZtECwzErWcewFH/nI+QFS02hTm1p9vrB8v9 puy2WjdcLOUHt7js+dGtkln7rrJtfXw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1glvzt-0003L5-7l; Tue, 22 Jan 2019 13:21:45 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1glvzr-0003Kf-2A for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2019 13:21:44 +0000 Received: by mail-pl1-x643.google.com with SMTP id gn14so11479654plb.10 for ; Tue, 22 Jan 2019 05:21:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=euK4ZIyk6B19PT813VSDOnPJkx4d5LHCeMqPJd1aM7s=; b=ifqNeXZWBx+cSJs+BkrC38f3XF88AhaIyImBMv0oNKRrpwVKoNXtInlwfbqYw0UebY +4EH3Ry0FtdIIDBbkAC/8XAds81tNArKoVFQLhRvfGLJLLno7l4BP+zpVtIQOvVYCxfd UeXzZ3Hewmv+k0WwxS+vGHQykIMx64UYi/3z4= 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=euK4ZIyk6B19PT813VSDOnPJkx4d5LHCeMqPJd1aM7s=; b=WcXa73rXu6dRQ2Q5Ts3/GHf/Ms94o+rxLDaklZQBJgCvt/+rZU6V89irDP1yiX+7u4 nRoUbYpWoeERVMDsatlnVZqmwwAODGe9DpA4HNoK3bQoc39ekevHwh1rYwuPb3cbxKMF Ee/r6DOG/iiIXLvlDdnOA6bpHqKrWmn2ZBH3knCIXWJXTWJACs6307kyZ0PzANEyAcKO QA+lB5CD4vpU5YKidETGprTPr361BB1zaoTymkhYZEKMg1kIkyKT4cHKqjbuz7djUrxk e85O42SVa8dSQwzMx79d9ay2XuBnrueEwdaxWK9spllq5PZnuxWkKVw7619wmeP0n6zf bUvQ== X-Gm-Message-State: AJcUukfg0H72j61upcBUVbKeyI8BBH7/ancx3h0mbgBlqYPD07pv3b62 yN2aRrSwTNKmhZOzw3mVhtkiHA== X-Google-Smtp-Source: ALg8bN7o9RYueCBe0lZNaR5aIq2epf1WyUYhHSDbVeRj+xDQpH350xWmTJItTx1o4/fQxRnAchpVDg== X-Received: by 2002:a17:902:583:: with SMTP id f3mr35085581plf.202.1548163302104; Tue, 22 Jan 2019 05:21:42 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id l185sm21609574pfl.54.2019.01.22.05.21.37 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:21:41 -0800 (PST) From: Baolin Wang To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 1/3] dt-bindings: dmaengine: Add one new cell to present hardware slave id Date: Tue, 22 Jan 2019 21:20:51 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190122_052143_102710_C7E5593A X-CRM114-Status: GOOD ( 10.47 ) 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: devicetree@vger.kernel.org, eric.long@unisoc.com, arnd@arndb.de, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, arm@kernel.org, olof@lixom.net, orsonzhai@gmail.com, dan.j.williams@intel.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 DMA engine clients can trigger DMA engine automatically by setting the corresponding hardware slave id for the DMA engine. Thus add one cell to present the hardware slave id for DMA clients. Signed-off-by: Baolin Wang Acked-by: Arnd Bergmann --- Documentation/devicetree/bindings/dma/sprd-dma.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/sprd-dma.txt b/Documentation/devicetree/bindings/dma/sprd-dma.txt index 7a10fea..7812cf0 100644 --- a/Documentation/devicetree/bindings/dma/sprd-dma.txt +++ b/Documentation/devicetree/bindings/dma/sprd-dma.txt @@ -6,8 +6,8 @@ Required properties: - compatible: Should be "sprd,sc9860-dma". - reg: Should contain DMA registers location and length. - interrupts: Should contain one interrupt shared by all channel. -- #dma-cells: must be <1>. Used to represent the number of integer - cells in the dmas property of client device. +- #dma-cells: must be <2>. Used to represent the channel id and slave id + of integer cells in the dmas property of client device. - #dma-channels : Number of DMA channels supported. Should be 32. - clock-names: Should contain the clock of the DMA controller. - clocks: Should contain a clock specifier for each entry in clock-names. @@ -28,14 +28,16 @@ apdma: dma-controller@20100000 { Client: DMA clients connected to the Spreadtrum DMA controller must use the format -described in the dma.txt file, using a two-cell specifier for each channel. -The two cells in order are: +described in the dma.txt file, using a three-cell specifier for each channel. +The three cells in order are: 1. A phandle pointing to the DMA controller. 2. The channel id. +3. The hardware slave id which is used for clients to trigger DMA engine +automatically. spi0: spi@70a00000{ ... dma-names = "rx_chn", "tx_chn"; - dmas = <&apdma 11>, <&apdma 12>; + dmas = <&apdma 11 11>, <&apdma 12 12>; ... }; From patchwork Tue Jan 22 13:20:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "(Exiting) Baolin Wang" X-Patchwork-Id: 10775495 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB13A14E5 for ; Tue, 22 Jan 2019 13:22:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A790529092 for ; Tue, 22 Jan 2019 13:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9976C2A0DD; Tue, 22 Jan 2019 13:22:08 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 74D5229092 for ; Tue, 22 Jan 2019 13:22:07 +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:References: In-Reply-To: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:List-Owner; bh=cHIu5xw14qHI6HdpMIR/2QnAmMt0qZcmxkX4gIwO3MU=; b=c2tTf3JYugYCxZOA22Q1/FZqMd Q1K5Lag+SC4UfsN64oxi92FTCvgWvquqOnPBrhGBCr1fBV1QA+jBGDDyoSNRa8yWq6c7bOWfZJZ5P 3iPU/Hn38KBjqppK4m1OHNDy+gvtM0RHerZ7GEs4ekpFKvbuHnEnTAS4fyTB8jYgGGYGrcnqu1ny5 MLDZxwT4/XnrEr9fKuqNprOW71ndbSMcgtU8A8kojUWpxO+I7TDoDqotAaZuk/3spxuzfgVzggDhP HSpdpmoLFe3xIgSz7G8MXEMuF44wVwsJGu7yFwnZvKb0hjawmI4i/gT1wOUV2oXg87pCyodomE7Ij nvdm8rQQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1glw0C-0003dj-Kl; Tue, 22 Jan 2019 13:22:04 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1glvzw-0003Ns-AU for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2019 13:21:53 +0000 Received: by mail-pf1-x441.google.com with SMTP id i12so11762009pfo.7 for ; Tue, 22 Jan 2019 05:21:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=aThP/Y0UG/Bg6pZXhNtucLsiLRzzJRNdslnI1cWQFgk=; b=L3KhXxkKfjsH+L/BnnSqvkjQnyke/EFblv6Xj9LR5HpaDYCG2SW+L1rZPux21lQZOy 6QlGOs3Fk+PCVOn136Z1R+D+jrRAPLWxAxVmDq5npItzATHgmUGDTEYJ19DG8oRODYc7 elvbX1t+aPoMNLPjK3juuGj4wpVIYB0zb/f+w= 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:in-reply-to:references; bh=aThP/Y0UG/Bg6pZXhNtucLsiLRzzJRNdslnI1cWQFgk=; b=UmPVno7ehj+0viF2CeQL7wf9UM8TCK/MBHPr9rmnU7npkUJsp25EbHhDMrVfNd8T0M pSMgbJ/RC1ImW9Ud306MubR8kZGv0kvqm7dTUkV7y0FMDQt1qhVZo4nRjvCqM6kbYkaY Emx31pAUAoLOaHOasxEsz6CjHmZ2Fo6sCFgy18Q0DeUWYAof36KewfJKpxxIv/HOldW5 t9ymSNIxDyaBEvwu61dfmQLqxrZvNbE9c+dkrbsKSEQjD2fxC2ORgwb4x+Kq3oMbyNGR YwctgXteIoDWAg6WdYwf0x3Z4sJUyZTykt9VA8oWOXXnxRTPk6ihrIFMKhpU8pqQvlHh aASw== X-Gm-Message-State: AJcUukfEDw3+nfQJGjHJ0d/gnauswsjweZQiVWYXElcEoFbYbZ0glfCC A2CflBfRUi0t7k/OEZr3i8eZQw== X-Google-Smtp-Source: ALg8bN7IMe1xG7oWLmt59zeewvS276awFJgI0jA50yMh6opTTidFaX//dX+l9hYA9ckDUMNYQQUSgg== X-Received: by 2002:a62:35c7:: with SMTP id c190mr34406112pfa.76.1548163307648; Tue, 22 Jan 2019 05:21:47 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id l185sm21609574pfl.54.2019.01.22.05.21.42 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:21:46 -0800 (PST) From: Baolin Wang To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 2/3] dmaengine: sprd: Add new DMA engine translation function Date: Tue, 22 Jan 2019 21:20:52 +0800 Message-Id: <529bc30b34a14bf7849fc852c7cbff34dee47aaa.1548158832.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190122_052148_981414_6D8E790A X-CRM114-Status: GOOD ( 13.82 ) 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: devicetree@vger.kernel.org, eric.long@unisoc.com, arnd@arndb.de, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, arm@kernel.org, olof@lixom.net, orsonzhai@gmail.com, dan.j.williams@intel.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 Add new DMA engine translation function to get the hardware slave id of the corresponding DMA engine channel. Meanwhile we do not need to set default slave id in sprd_dma_alloc_chan_resources(), remove it. Signed-off-by: Baolin Wang --- drivers/dma/sprd-dma.c | 49 ++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index e2f0167..7d180bb 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -204,9 +204,9 @@ struct sprd_dma_dev { struct sprd_dma_chn channels[0]; }; -static bool sprd_dma_filter_fn(struct dma_chan *chan, void *param); -static struct of_dma_filter_info sprd_dma_info = { - .filter_fn = sprd_dma_filter_fn, +struct sprd_dma_filter_param { + u32 chn_id; + u32 slave_id; }; static inline struct sprd_dma_chn *to_sprd_dma_chan(struct dma_chan *c) @@ -580,15 +580,7 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id) static int sprd_dma_alloc_chan_resources(struct dma_chan *chan) { - struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); - int ret; - - ret = pm_runtime_get_sync(chan->device->dev); - if (ret < 0) - return ret; - - schan->dev_id = SPRD_DMA_SOFTWARE_UID; - return 0; + return pm_runtime_get_sync(chan->device->dev); } static void sprd_dma_free_chan_resources(struct dma_chan *chan) @@ -1022,12 +1014,31 @@ static bool sprd_dma_filter_fn(struct dma_chan *chan, void *param) { struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); struct sprd_dma_dev *sdev = to_sprd_dma_dev(&schan->vc.chan); - u32 req = *(u32 *)param; + struct sprd_dma_filter_param *sparam = param; - if (req < sdev->total_chns) - return req == schan->chn_num + 1; - else - return false; + if (sparam->chn_id < sdev->total_chns && + sparam->chn_id == schan->chn_num + 1) { + schan->dev_id = sparam->slave_id; + return true; + } + + return false; +} + +static struct dma_chan *sprd_dma_xlate(struct of_phandle_args *dma_spec, + struct of_dma *ofdma) +{ + struct sprd_dma_dev *sdev = ofdma->of_dma_data; + dma_cap_mask_t mask = sdev->dma_dev.cap_mask; + struct sprd_dma_filter_param param; + + if (dma_spec->args_count != 2) + return NULL; + + param.chn_id = dma_spec->args[0]; + param.slave_id = dma_spec->args[1]; + + return dma_request_channel(mask, sprd_dma_filter_fn, ¶m); } static int sprd_dma_probe(struct platform_device *pdev) @@ -1133,9 +1144,7 @@ static int sprd_dma_probe(struct platform_device *pdev) goto err_register; } - sprd_dma_info.dma_cap = sdev->dma_dev.cap_mask; - ret = of_dma_controller_register(np, of_dma_simple_xlate, - &sprd_dma_info); + ret = of_dma_controller_register(np, sprd_dma_xlate, sdev); if (ret) goto err_of_register; From patchwork Tue Jan 22 13:20:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "(Exiting) Baolin Wang" X-Patchwork-Id: 10775497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59FDB14E5 for ; Tue, 22 Jan 2019 13:22:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48C7E2A0DE for ; Tue, 22 Jan 2019 13:22:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C31F2A0EB; Tue, 22 Jan 2019 13:22:18 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 D971B2A0DE for ; Tue, 22 Jan 2019 13:22:17 +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:References: In-Reply-To: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:List-Owner; bh=bad0sK5gccEi9B9SxpcTBSLkFJjhMw+ogKMnr/w5yNk=; b=sgEQNLQ+BOqjHhqHF49/F/0lu4 sfC84/R+S01HPKqfLppTOf2G/cSZiFi72JcW0KTjVnG8RHR68GyoKcoQ4Otxbp38YSXBarxhFMOdR ejct8oEJwl0r79p2vCD8alEc2XfyjQ8as3WmqYy1v6QGPPRvF577LY4duePm9zuCBo4/68BubmWdl 2xBiKzGWmlywidi0kxDqJjb+AdeorqqJK4vh90wtQ7IZYkCehga4Gwy/7Ok1yBC7DZ0YY/kEI8WmE rF5+Bwl9KIqxAkySk0UdIGWGv7Kz4tWdilek/09pGEJCTy21bhk9DNXxahcyX6PJIwmCJEoGZlo45 IGXD8AOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1glw0P-0003pB-3O; Tue, 22 Jan 2019 13:22:17 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1glw02-0003UK-0j for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2019 13:21:57 +0000 Received: by mail-pl1-x644.google.com with SMTP id a14so11465062plm.12 for ; Tue, 22 Jan 2019 05:21:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=OIolF++DBLb/hz3Yaz/nran8arOkyxEnLLroytUGF80=; b=a/qt11LKV/+zOK/6ySzuyxvITAkl0FBYgrPDH2o8Eg/GnYgfnPn4dUbMB4m/WuwfKt W5/vXs8ovAyg+9wKWFfOQPzOXmKsKvkPZxnpOfxRrtzIj4TLWZEQU/yzlImfXkeDGLAW bKlqJPoGSHfAB7G4IVyqXOzcRhBXBD/50uvYA= 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:in-reply-to:references; bh=OIolF++DBLb/hz3Yaz/nran8arOkyxEnLLroytUGF80=; b=Z2JRZi20hn7H01iPMBD3kSAAOL6GktEUupvuM0uvngFpodomzBIszP+XObW2f/Wa2u mVp5zvChSnbObyrbbcrh1iip/vkAxWTIds9s3vd2fq5oBHMdgnyXvpLyxqxJiIKIaY2T FIOu/GHpLOk9X6UZ4nqiO6KOqXHgRW6nJ3cPdJWJy27zoazg92BYu19NWfJXmoaUqsGY HRFvFp7DmsDiVzekJacdvJZ+g4KTZY9U6yf+4Ua1PSfUbZpmar9tjHHyxglI1Y637pGd zqkUfSrim8dOX1hx/Kf4JO5CpmYyVPFXkGjsL49Aox4B4CG8VDZZOSRD5afQp66a6LyA VQSw== X-Gm-Message-State: AJcUukfHs9pZhMQ3+9LZVQ8mYm7F1UZggqCziyfvW4QkqtUV16u4E64B Zli1A3Z2g47LZ7ijZzRRmSYfoQ== X-Google-Smtp-Source: ALg8bN7/0SWz5gYbYU9eFTAYHI9OW8/XaHf5Zko66LCEWBGbg7qvDe8YgkXXlE7R39+JwugTQmyOUw== X-Received: by 2002:a17:902:292b:: with SMTP id g40mr34579416plb.82.1548163312908; Tue, 22 Jan 2019 05:21:52 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id l185sm21609574pfl.54.2019.01.22.05.21.47 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:21:52 -0800 (PST) From: Baolin Wang To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Subject: [PATCH 3/3] arm64: dts: sprd: Change 2 cells to provide DMA controller specific information Date: Tue, 22 Jan 2019 21:20:53 +0800 Message-Id: <44135b35c8a4fb1a68bb9c57013b672dd0fab3e7.1548158832.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190122_052154_574219_C2AFE546 X-CRM114-Status: GOOD ( 10.82 ) 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: devicetree@vger.kernel.org, eric.long@unisoc.com, arnd@arndb.de, baolin.wang@linaro.org, zhang.lyra@gmail.com, broonie@kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, arm@kernel.org, olof@lixom.net, orsonzhai@gmail.com, dan.j.williams@intel.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 Change to use 2 cells to provide the channel id and slave id for client. Signed-off-by: Baolin Wang --- arch/arm64/boot/dts/sprd/whale2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi index 34b6ca0..dbd61f8 100644 --- a/arch/arm64/boot/dts/sprd/whale2.dtsi +++ b/arch/arm64/boot/dts/sprd/whale2.dtsi @@ -117,7 +117,7 @@ compatible = "sprd,sc9860-dma"; reg = <0 0x20100000 0 0x4000>; interrupts = ; - #dma-cells = <1>; + #dma-cells = <2>; #dma-channels = <32>; clock-names = "enable"; clocks = <&apahb_gate CLK_DMA_EB>; @@ -273,7 +273,7 @@ agcp_dma: dma-controller@41580000 { compatible = "sprd,sc9860-dma"; reg = <0 0x41580000 0 0x4000>; - #dma-cells = <1>; + #dma-cells = <2>; #dma-channels = <32>; clock-names = "enable", "ashb_eb"; clocks = <&agcp_gate CLK_AGCP_DMAAP_EB>,