From patchwork Fri Jul 6 03:55:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 141240 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2643826ljj; Thu, 5 Jul 2018 20:56:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfD3EG5C8aO5WQ1T1kS9gIDqCKXkAklG9OuvpGHx6BEBuXZavmaxeAHgALFGiDYRAYKliLQ X-Received: by 2002:a17:902:bd42:: with SMTP id b2-v6mr8673131plx.23.1530849369119; Thu, 05 Jul 2018 20:56:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530849369; cv=none; d=google.com; s=arc-20160816; b=h2vYmfyorYzZY3BQb2siNWFsKi539JbAa0xMwMYCLdzv/g3IEur+skxLI5H1D4MCFR 7M25RurhXIroMX5tBKzL+3t6pxTRDUlbxfVj4p+PYXgiim84Du02QVboOjINQeybKAp7 XBwo993+SMLeoM/t7fhOdQNcy0Z5KS5rJtSm/q3t62Rub0K7wagxSxcSPG2Zi+Uei3q6 kuHlk3GmkH2Li5kqPqE6HTtd/CLkCdsgCw7zDisKnCFZ0KbR50u3El2Tk7BKnmyWuDyK 13vy74/NAbhyuolg9ERHuoQrydevY6SYcpm7C7MCiTXZepT8VqekuultofoN0Xxhq+KY ZDIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=t33j/YWl9147C3o56cc/SXhWTJq/mWttqXWsSRue59w=; b=WO7nAM+vT0+QavkWnRksjGyu/X8Hicrv4Wb8MvVI52C8KQNaLCOQcfVPqmG8KvMlCV fD3BaxlIIeAqRb50AyvQFXrVVtpybHGmxA5VU+Xvd0RWcDTRJvoVU81ucM5vB/oI/20o AwiZZK9/6xbsZXWKCYQvUad7TP0ueVIalOFMhwaAXLLuEqwPWOvvkj/vqiXprK7Ln+1P YcftqSsM6QNZ04/y2iD9kYookfFmpUUHI8RhLWnVpOdRzbVU6qGqNlYqVlwnPTWWOWu1 j4MoywVjNtwpFquI5ofgTXJsivapQaC3IHncPcU4dE2aP96A0WRBA+E2aEev8lP8sgL8 ChOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FKSjxOyN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32-v6si7580123ple.447.2018.07.05.20.56.08; Thu, 05 Jul 2018 20:56:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FKSjxOyN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932342AbeGFD4H (ORCPT + 30 others); Thu, 5 Jul 2018 23:56:07 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:46487 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261AbeGFD4D (ORCPT ); Thu, 5 Jul 2018 23:56:03 -0400 Received: by mail-pf0-f195.google.com with SMTP id l123-v6so7208869pfl.13 for ; Thu, 05 Jul 2018 20:56:03 -0700 (PDT) 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; bh=t33j/YWl9147C3o56cc/SXhWTJq/mWttqXWsSRue59w=; b=FKSjxOyNyLIFqLRBdLbPexUrj0l53lmf2+WYmqJkoaH8FoZ4gOmGG1nPNuloakxI3H 3KBYdenCi3prowOjbwKen0iX+OG1lMiUg3mRMDqY/I5/Lb7R4z5OQAXK/Kxvw1Gx2A77 hdM12KOYrciQzRugydXXC4t9CSt0uWHeeV4OE= 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=t33j/YWl9147C3o56cc/SXhWTJq/mWttqXWsSRue59w=; b=nin+c8+jr343evlU6D83Va0EwxZzCRUoRKDBGTxinOpaNs5xDSZcAsj22VAr4gO3Px tyJ/lhczTPLIRFRGdaC/m+maYZ7uuDWRwsSt+8WYeHP4Y/rNN6uCpNNVvKnFXL+O5N8w Se9qGi5fjkuwKPIo2kMYNev5mSNjN4dGmzEFN1rPANXml0Em5GoEmNLWWoEMMtS0hpcj 1wgWbF36/111P4BxwbYtlK/b2Fb1otDs0hmZIilPh9oOGRjCrSpYWdrfSn/yw90dH/n3 HxQ5vVzmmQBgb+4+8rHNf4BWQJotdxmAAxUbo2f0+jnqFIeG85uQUW1e9HeqR0m1bLkW hSzQ== X-Gm-Message-State: APt69E3MzHAJCyUrHJ7Y1a4OYJtfDxjZVLm3GaAPXjfhG+kLRKeB64/+ a60rm/S1k4XXXjSBYI9CHTfPiw== X-Received: by 2002:a65:5288:: with SMTP id y8-v6mr1176118pgp.284.1530849362942; Thu, 05 Jul 2018 20:56:02 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.33]) by smtp.gmail.com with ESMTPSA id y14-v6sm12568403pgo.22.2018.07.05.20.55.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 20:56:02 -0700 (PDT) From: Guodong Xu To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, dan.j.williams@intel.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com Cc: liyu65@hisilicon.com, suzhuangluan@hisilicon.com, xuhongtao8@hisilicon.com, zhongkaihua@huawei.com, xuezhiliang@hisilicon.com, xupeng7@huawei.com, sunliang10@huawei.com, fengbaopeng@hisilicon.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guodong Xu Subject: [PATCH v2 1/4] dt-bindings: k3dma: add optional property hisilicon, dma-min-chan Date: Fri, 6 Jul 2018 11:55:18 +0800 Message-Id: <20180706035521.13736-2-guodong.xu@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706035521.13736-1-guodong.xu@linaro.org> References: <20180706035521.13736-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li Yu Add optional property hisilicon,dma-min-chan for k3dma. Signed-off-by: Li Yu Signed-off-by: Guodong Xu --- Documentation/devicetree/bindings/dma/k3dma.txt | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.17.1 diff --git a/Documentation/devicetree/bindings/dma/k3dma.txt b/Documentation/devicetree/bindings/dma/k3dma.txt index 4945aeac4dc4..f34202a80f3c 100644 --- a/Documentation/devicetree/bindings/dma/k3dma.txt +++ b/Documentation/devicetree/bindings/dma/k3dma.txt @@ -12,6 +12,11 @@ Required properties: have specific request line - clocks: clock required +Optional properties: +- hisilicon,dma-min-chan: the minimum DMA channel number which is usable + Default value is 0, but in some platform it is + configured 1, like in hi3660 platform + Example: Controller: @@ -21,6 +26,7 @@ Controller: #dma-cells = <1>; dma-channels = <16>; dma-requests = <27>; + hisilicon,dma-min-chan = <1>; interrupts = <0 12 4>; clocks = <&pclk>; }; From patchwork Fri Jul 6 03:55:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 141241 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2643890ljj; Thu, 5 Jul 2018 20:56:16 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc/aL68PQ6RgATkil/34sByuCivafA9Nua065C37gHgXdByxExrq4ktWgaYb6Elc/X2sFOl X-Received: by 2002:a62:d544:: with SMTP id d65-v6mr8953380pfg.107.1530849376500; Thu, 05 Jul 2018 20:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530849376; cv=none; d=google.com; s=arc-20160816; b=sqp2AecMfcBCXw57/4p5TXNU2TQvRALFnnPd9LaLPf4IPSw5fiYvdRLnxod2Cpl++D 3uyDpqDfAa9iOhDEHKn38KxKUIWbftLRWBXf+oWzc1Jm5Go5fqW2CNBpj7/Q3Njia1og +fVWfZzIdhVJ+4So3ff5WwETuCbpWg87HSldU0d0vIINpIuffI7U+M/z2wOuI0hlAqjY pkKndfysQ+5CJZVoi+kXB8g3PSDjN5a0zgaNxZ5eSTz78gxRDZj0Ql9XGuffe+w2Q03i tRXJsItB4pg+ohzT+ecDy4TxdYsx18y01mqygtDbCJZFu7v4GXqjIzXq2U+9ivf5p5QO iVZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=GeiCyeTYAnNlTAnZk8bbwnhnfWJCW6BUDmOpTlPEQKk=; b=igg+wmx9LmkAdTk/hPuowCErXb99g5JpORMps3hRE5IWAUcNmc3VKANr/leVQNH1nr Z+vMSBQ3bBpDkb+NimhXZWL6gJeVbeDaHdQyxk+8zbJKYa6peQHLvfoyVPqaf8XvRtGA gt2E05Q+O1eqg0jPbH3P+G43wmODflWxUFXtdekMhsXD5Z4WbV/Phh4sFKojNXi7FvFh MhRpfW7xFlPusE7/xFeOdYnACKug9ijKrshk3cowaNFAuYbnq91ukzNQS2GQRVNm0ig2 NkTsUcrQNvSBFpPk+sjF9v8QDhkfi/C4NeILmRbIy8Zwg5COWCTQKAiHyWxI0B/SWgkm bbQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UeCCy/kn"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32-v6si7580123ple.447.2018.07.05.20.56.16; Thu, 05 Jul 2018 20:56:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UeCCy/kn"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932429AbeGFD4O (ORCPT + 30 others); Thu, 5 Jul 2018 23:56:14 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:38284 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932348AbeGFD4M (ORCPT ); Thu, 5 Jul 2018 23:56:12 -0400 Received: by mail-pf0-f193.google.com with SMTP id j17-v6so7218796pfn.5 for ; Thu, 05 Jul 2018 20:56:12 -0700 (PDT) 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; bh=GeiCyeTYAnNlTAnZk8bbwnhnfWJCW6BUDmOpTlPEQKk=; b=UeCCy/knUULgWF+J4DSAqihvfMaKzsAGxTljMybYmfjV9wxFjxOj/Zue5EAI+Wr0Uq NksK/mG80BcDR3I8+rmH8VUtQlxwNCUjvX27t8bQAS4OIDaFX85e02VPgB3M5ajaPRcB g44fz8W4WQr5oCgIYkeWX/Ywv5y7tSZ9EJJV0= 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=GeiCyeTYAnNlTAnZk8bbwnhnfWJCW6BUDmOpTlPEQKk=; b=AYWgw7+V6vTannmj0i0aaZnMnPvE/P4stmq6dE7kG5RaBv07+WuAC9IqLlIaPwy8Wg 8/2IyirtWAFo6THxok9VXgDetsLOvRTD0E50RxTgLwW2HXijexXqGIRtQXWYUgiPcRtO 3rVYNNvJBO7a+n6YqZepW0aBn+3xf6mHBYQh2AsMiQ9pZYvfINyvUnZQY+NXXhTQcsPW F2thQzcc5tjhtRooSO8zwI89DHNhMnthQEn1feUr6+8GRKEHQ3x+gMREaftZFeb+swS9 dOxPGsaSM7btEUwoO42RlI4LLKXdk2x3FIiMZuwzZD8FV7myaLULPaL303LKO4ci4NFz 8uIA== X-Gm-Message-State: APt69E1qz4FvM/enPlsh4FE1/Ucvw380WLdbT/y8n7hgJA8IdNV/2yi1 tJk9mJkbginbEUsQFdPx3wgnEA== X-Received: by 2002:a62:3e1a:: with SMTP id l26-v6mr9019822pfa.214.1530849371845; Thu, 05 Jul 2018 20:56:11 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.33]) by smtp.gmail.com with ESMTPSA id y14-v6sm12568403pgo.22.2018.07.05.20.56.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 20:56:11 -0700 (PDT) From: Guodong Xu To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, dan.j.williams@intel.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com Cc: liyu65@hisilicon.com, suzhuangluan@hisilicon.com, xuhongtao8@hisilicon.com, zhongkaihua@huawei.com, xuezhiliang@hisilicon.com, xupeng7@huawei.com, sunliang10@huawei.com, fengbaopeng@hisilicon.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guodong Xu Subject: [PATCH v2 2/4] k3dma: add support to reserved minimum channels Date: Fri, 6 Jul 2018 11:55:19 +0800 Message-Id: <20180706035521.13736-3-guodong.xu@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706035521.13736-1-guodong.xu@linaro.org> References: <20180706035521.13736-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li Yu On k3 series of SoC, DMA controller reserves some channels for other on-chip coprocessors. By reading property "hisilicon,dma-min-chan" from dts node, kernel will not use these reserved channels. As an example, on Hi3660, channel 0 is reserved for lpm3. Refer to Documentation/devicetree/bindings/dma/k3dma.txt for more information. Signed-off-by: Li Yu Signed-off-by: Guodong Xu --- drivers/dma/k3dma.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index fa31cccbe04f..33efb541acb2 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -113,6 +113,7 @@ struct k3_dma_dev { struct dma_pool *pool; u32 dma_channels; u32 dma_requests; + u32 dma_min_chan; unsigned int irq; }; @@ -309,7 +310,7 @@ static void k3_dma_tasklet(unsigned long arg) /* check new channel request in d->chan_pending */ spin_lock_irq(&d->lock); - for (pch = 0; pch < d->dma_channels; pch++) { + for (pch = d->dma_min_chan; pch < d->dma_channels; pch++) { p = &d->phy[pch]; if (p->vchan == NULL && !list_empty(&d->chan_pending)) { @@ -326,7 +327,7 @@ static void k3_dma_tasklet(unsigned long arg) } spin_unlock_irq(&d->lock); - for (pch = 0; pch < d->dma_channels; pch++) { + for (pch = d->dma_min_chan; pch < d->dma_channels; pch++) { if (pch_alloc & (1 << pch)) { p = &d->phy[pch]; c = p->vchan; @@ -825,6 +826,8 @@ static int k3_dma_probe(struct platform_device *op) "dma-channels", &d->dma_channels); of_property_read_u32((&op->dev)->of_node, "dma-requests", &d->dma_requests); + of_property_read_u32((&op->dev)->of_node, + "hisilicon,dma-min-chan", &d->dma_min_chan); } d->clk = devm_clk_get(&op->dev, NULL); @@ -848,12 +851,12 @@ static int k3_dma_probe(struct platform_device *op) return -ENOMEM; /* init phy channel */ - d->phy = devm_kcalloc(&op->dev, - d->dma_channels, sizeof(struct k3_dma_phy), GFP_KERNEL); + d->phy = devm_kcalloc(&op->dev, (d->dma_channels - d->dma_min_chan), + sizeof(struct k3_dma_phy), GFP_KERNEL); if (d->phy == NULL) return -ENOMEM; - for (i = 0; i < d->dma_channels; i++) { + for (i = d->dma_min_chan; i < d->dma_channels; i++) { struct k3_dma_phy *p = &d->phy[i]; p->idx = i; From patchwork Fri Jul 6 03:55:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 141242 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2643968ljj; Thu, 5 Jul 2018 20:56:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeBrRNG1REUG3MQZetZdZ+0UeLpS35awhUchRxUo0weems5f/0cPgCrjUIBX5aXqW9gzTbg X-Received: by 2002:a63:4857:: with SMTP id x23-v6mr1901475pgk.30.1530849386501; Thu, 05 Jul 2018 20:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530849386; cv=none; d=google.com; s=arc-20160816; b=eAlkn2pesWNWxjPunyF6yvRzkoQkGjBPkDxyxgcxEgBBlyif6umilVMFaIOsHlkO6F iZxZ4yy7RSh2vIbJI7Hc70tv0ZDnii5WRUl6qRQSe+XQAZJyu0ODHAmYlkYFfDUGsF49 /K7sm693AR9kcJMOPooTmUyyZvbs5Q/2/1fr0BDyl6C5X5yw0MMlUEyMoQx8pOQQ/MEm jvL2bRsuWotdrsL5XGzesQFXUzeGHBkC1gdEWmkJEyOhFQfUdiekMy8VCMXLZLtao6Ex D6R5NoHt+rt0yOaqAKOfXkhwOycD4mF/cthlv836iqHzINzqjhugt3iR34kDfIXxIxff VTrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=X2WfBOmihLgE5IfqJ+Pm83qoggVHezr58VMhg/98XCM=; b=C1wIvUnaIXtHg7A7D/qywErsHl+ePIR9PkTwOF+WZOeN4CzBdHKR0oxQXZYyZGViEB zM5A3qwsd4uvgMD2iP1x9dyrvwy+hDT8gVSGW6DAPyDZwWYQr6ZMuam1WUiVgQyiR2CB 09bgwAskEh6Ltw1qzRdy0DbWB43P4s13FfIUHiLtN8o3V+L4yrxCr5kHMdHS8cLKnwjG 5Y8FT2vr8YX1WWelDz9IHmzMmb05CDYY+Ftu6jf8CASqFilOU1TBXWIVtmUnfkHEsB4B VrG+rsNvP1AyxFe9YhsHYzJSXnl0fm5tEhIHadeeAmhMPjOolOAoAIOUWmiTO1LPWGNo R5Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cf1ImKUM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 32-v6si7580123ple.447.2018.07.05.20.56.26; Thu, 05 Jul 2018 20:56:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cf1ImKUM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932502AbeGFD4Y (ORCPT + 30 others); Thu, 5 Jul 2018 23:56:24 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:41551 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932348AbeGFD4V (ORCPT ); Thu, 5 Jul 2018 23:56:21 -0400 Received: by mail-pl0-f67.google.com with SMTP id w8-v6so2215539ply.8 for ; Thu, 05 Jul 2018 20:56:21 -0700 (PDT) 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; bh=X2WfBOmihLgE5IfqJ+Pm83qoggVHezr58VMhg/98XCM=; b=Cf1ImKUMtfIe4I3pXF3SLLB44uPj7EwUwD7pByrd6Me/BxVw2j7lzu0EOhey2xvpeS 6JgBB5BNbCPzIWvT7HC6K00P0Tx2Am25Gk1NHDUWyziXGdXg4Mm1E4UxZlxNWL3z1C8C AzzDCsa/UK1pn/x8C8CiztXbWJBxjK4GrIZBY= 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=X2WfBOmihLgE5IfqJ+Pm83qoggVHezr58VMhg/98XCM=; b=Vt897jYVkkY/l14zOtZtidMmM3QX4407sfA1bunN25M34AmOmDRGNZsU+LdWFgjbLp N4wAmZDMDlWONsimmNqd3YDK3z9SfjJ1RD6RSsX+kzs4dSWE/rAhcummoR+YGz65mVqx eRYek5m3DZNUhmjnJNmRjRTfOl1Xoa16jVKTSBdcJUpULJJQN0DS2kcsMOOxWgBCYo/+ UdriUo0Yii4xtbQelCFPioHIJutf/IsLdTmmMswnRktw8OBiuKZp//lpE1zXe7T38m82 nbWPxDJDl92gdXCJqvC7D5zkVaUgvYp/bou/tupIpqx9tXCgNGqItKvG3rU65rHJJesu A87w== X-Gm-Message-State: APt69E20jar/564e9HKPCdVJwf3iE4C8BjG+zDv6n8Ad0hBpGUU3qU/N d5i7qfJ6lYL2/r1ctmgNdToMWKid7Yo= X-Received: by 2002:a17:902:3303:: with SMTP id a3-v6mr8702816plc.209.1530849381135; Thu, 05 Jul 2018 20:56:21 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.33]) by smtp.gmail.com with ESMTPSA id y14-v6sm12568403pgo.22.2018.07.05.20.56.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 20:56:20 -0700 (PDT) From: Guodong Xu To: vkoul@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, dan.j.williams@intel.com, xuwei5@hisilicon.com, catalin.marinas@arm.com, will.deacon@arm.com Cc: liyu65@hisilicon.com, suzhuangluan@hisilicon.com, xuhongtao8@hisilicon.com, zhongkaihua@huawei.com, xuezhiliang@hisilicon.com, xupeng7@huawei.com, sunliang10@huawei.com, fengbaopeng@hisilicon.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guodong Xu Subject: [PATCH v2 3/4] arm64: dts: hi3660: update property name hisilicon, dma-min-chan Date: Fri, 6 Jul 2018 11:55:20 +0800 Message-Id: <20180706035521.13736-4-guodong.xu@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180706035521.13736-1-guodong.xu@linaro.org> References: <20180706035521.13736-1-guodong.xu@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update property name dma-min-chan to "hisilicon,dma-min-chan" Signed-off-by: Guodong Xu --- arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index 8d477dcbfa58..0cec26976eb6 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -537,7 +537,7 @@ #dma-cells = <1>; dma-channels = <16>; dma-requests = <32>; - dma-min-chan = <1>; + hisilicon,dma-min-chan = <1>; interrupts = ; clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>; dma-no-cci;